Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo

This commit is contained in:
gugat 2011-07-14 09:44:12 -05:00
commit feeaf1bcb6
52 changed files with 484 additions and 192 deletions

23
bbb-api-demo/demo.nginx Normal file
View File

@ -0,0 +1,23 @@
# Forward request to /demo to tomcat. This is for
# the BigBlueButton api demos.
location /demo {
proxy_pass http://127.0.0.1:8080;
proxy_redirect default;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# Allow 30M uploaded presentation document.
client_max_body_size 30m;
client_body_buffer_size 128k;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_buffer_size 4k;
proxy_buffers 4 32k;
proxy_busy_buffers_size 64k;
proxy_temp_file_write_size 64k;
include fastcgi_params;
}

View File

@ -1,14 +0,0 @@
<%!
// This is the security salt that must match the value set in the BigBlueButton server
//String salt = "4951c2aea43e5af6d9598610b9e0b6c7";
//String salt = "5e5ff0968546b8aaacce0462a99bca30";
String salt = "c9181cea77a2f2a4c93a0e17d723b942";
// This is the URL for the BigBlueButton server 4951c2aea43e5af6d9598610b9e0b6c7
String BigBlueButtonURL = "http://192.168.0.104/bigbluebutton/";
%>

View File

@ -153,7 +153,7 @@ public class RoomManager {
rm.add(p);
if ((rm.numParticipants() == 1) && (rm.record())) {
if ((rm.numParticipants() == 1) && rm.record() && !rm.isRecording()) {
/**
* Start recording when the first user joins the voice conference.
* WARNING: Works only with FreeSWITCH for now. We need to come up with a generic way to

View File

@ -2,6 +2,7 @@ bbb.logout.usercommand = Vous vous êtes déconnecté de la conférence
bbb.settings.flash.command = Installer la dernière version de Flash
bbb.oldlocalewindow.reminder2 = Veuillez vider le cache de votre navigateur et essayer à nouveau.
bbb.presentation.maxUploadFileExceededAlert = Erreur : Le fichier dépasse la taille autorisée.
bbb.logout.invalidapp = L'application Red5 n'existe pas
bbb.fileupload.title = Envoyer un fichier à présenter
bbb.chat.publicMsgAwaiting2 = * Message public en attente *
bbb.viewers.viewersGrid.roleItemRenderer = Accès
@ -39,9 +40,11 @@ bbb.listenerItem.talkImg.toolTip = Parler
bbb.settings.warning.label = Attention
bbb.mainshell.copyrightLabel2 = (c) 2011, BigBlueButton version {0} - Pour plus d'information, visitez http://www.bigbluebutton.org/.
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
bbb.toolbar.video.toolTip = Activer ma webcam
bbb.chat.publicMsgAwaiting = Message public en attente
bbb.chat.sendBtn = Envoyer
bbb.publishVideo.title = Webcam / Visioconférence
bbb.logout.appshutdown = L'application serveur a été fermée
bbb.presentation.uploadPresBtn = Envoyer un document à présenter
bbb.presentation.uploadPresBtn.toolTip = Envoyer un document à présenter
bbb.highlighter.toolbar.ellipse = Cercle
@ -52,7 +55,9 @@ bbb.presentation.error.convert.maxnbpagereach = Erreur : Le fichier envoyé comp
bbb.desktopView.title = Partage d'écran
bbb.settings.java.label = Erreur de version Java
bbb.presentation.forwardBtn.toolTip = Page suivante
bbb.settings.java.text = Vous avez Java {0} installé, mais la version {1} minimum est nécessaire pour utiliser la fonctionnalité de partage d'écran de BigBlueButton. cliquez sur le bouton ci-dessous pour installer la dernière version de Java.
bbb.fileupload.genThumbText = Génération des vignettes d'images...
bbb.viewers.viewersGrid.statusItemRenderer = Statut
bbb.desktopPublish.title = Partage de bureau - Aperçu
bbb.mainToolbar.settingsBtn = Paramètres
bbb.fileupload.uploadBtn = Envoyer
@ -68,10 +73,11 @@ bbb.mainshell.logBtn.toolTip = Ouvrir la fenêtre de log
bbb.desktopPublish.stop.tooltip = Fermer le partage d'écran
bbb.presentation.uploadwindow.excel = EXCEL
bbb.settings.voice.volume = Activité du microphone
bbb.toolbar.video.toolTip = Activer ma webcam
bbb.logout.unknown = Votre client a perdu la connexion avec le serveur
bbb.presentation.slideNumLbl.toolTip = Cliquez pour sélectionner une page
bbb.settings.flash.text = Vous avez Flash {0} installé, mais la version {1} minimum est requise pour BigBlueButton. Cliquez sur le bouton pour installer la dernière version d'Adobe Flash.
bbb.highlighter.toolbar.rectangle = Rectangle
bbb.viewers.viewersGrid.statusItemRenderer = Statut
bbb.settings.voice.adjust = Ajuster le volume
bbb.presentation.uploadwindow.word = WORD
bbb.mainshell.statusProgress.loading = Chargement de {0} modules
bbb.presentation.error.io = Erreur de serveur lors de l'envoi du fichier. Contactez l'administrateur.
@ -124,6 +130,7 @@ bbb.mainshell.statusProgress.cannotConnectServer = Désolé, impossible de se co
bbb.logout.connectionclosed = La connexion au serveur a été fermée
bbb.chat.publicChatUsername = Tout le monde
bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = Présentateur
bbb.settings.isight.label = Erreur caméra iSight
bbb.mainToolbar.logoutBtn.toolTip = Se déconnecter
bbb.presentation.error.convert.notsupported = Erreur : le format de fichier envoyé n'est pas supporté. Merci d'envoyer un fichier compatible.
bbb.highlighter.toolbar.thickness = Changer la taille

View File

@ -1,118 +1,142 @@
bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again.
bbb.logout.usercommand = Anda telah keluar dari konferensi
bbb.settings.flash.command = Pasang Flash yang terbaru
bbb.oldlocalewindow.reminder2 = Harap bersihkan cache peramban anda kemudian coba lagi.
bbb.presentation.maxUploadFileExceededAlert = Error: File lebih besar dari yg diizinkan.
bbb.fileupload.title = Upload Presentasi
bbb.logout.invalidapp = Aplikasi red5 belum terpasang
bbb.fileupload.title = Unggah Presentasi
bbb.chat.publicMsgAwaiting2 = * Pesan publik sedang menunggu *
bbb.viewers.viewersGrid.roleItemRenderer = Peran
bbb.oldlocalewindow.windowTitle = Warning: Old Language Translations
bbb.presentation.converted = Dikonevrsi {0} dari {1} slide.
bbb.oldlocalewindow.windowTitle = Peringatan: Penerjemahan bahasa lawas
bbb.presentation.converted = Berhasil dikonversi
bbb.viewers.presentBtn.toolTip = Pilih siapa yang akan jadi presentasi.
bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip = Klik Untuk Melihat.
bbb.highlighter.toolbar.undo = Undo Bentuk
bbb.highlighter.toolbar.undo = Batalkan Pencitraan Bentuk
bbb.desktopPublish.minimizeBtn.toolTip = Minimalkan jendela ini.
bbb.viewers.presentBtn.label = Switch Presenter
bbb.viewers.presentBtn.label = Jadikan Presenter
bbb.viewers.kickUserBtn.toolTip = Kick User
bbb.listeners.ejectTooltip = Kick User
bbb.presentation.uploadcomplete = Upload selesai. Harap tunggu sampai dokumen di konversi.
bbb.presentation.uploadcomplete = Pengunggahan selesai. Harap menunggu sambil kami mengkonversi dokumen.
bbb.viewers.viewersGrid.statusItemRenderer.raiseHand.toolTip = Tangan di angkat{0}
bbb.mainToolbar.settingsBtn.toolTip = Buka pengaturan
bbb.desktopView.actualSize = Tampilkan ukuran sebenarnya
bbb.desktopPublish.region.tooltip = Bagikan sebagian layar anda
bbb.presentation.error.convert.swf = Error saat mengkonversi dokumen upload. Silahkan Kontak Administrator.
bbb.presentation.error.convert.swf = Error saat mengkonversi file unggahan. Silahkan hubungi Administrator.
bbb.fileupload.progBarLbl = Hasil:
bbb.presentation.error.security = Security Error: Silahkan Kontak Administrator.
bbb.presentation.error.security = Sekuritas bermasalah: Silahkan hubungi Administrator.
bbb.desktopPublish.maximizeRestoreBtn.toolTip = Anda tidak dapat memaksimalkan jendela ini.
bbb.listenerItem.nameLbl.toolTip = Pilih pengguna dan Kilk Tombol mute atau Unmute.
bbb.listenerItem.nameLbl.toolTip = Pilih pengguna ini dan klik tombol untuk mengaktifkan atau menonaktifkan suara.
bbb.desktopPublish.region.label = Bagian
bbb.chat.cmpColorPicker.toolTip = Warna Teks
bbb.listenerItem.muteUnmute.toolTip = Menonaktifkan atau mengaktifkan suara pendengar ini
bbb.chat.chatOptions = Pilihan Chatting
bbb.presentation.uploadwindow.closeLabel = Klik untuk keluar jendela
bbb.viewers.title = Users{0} {1}
bbb.chat.chatOptions = Opsi Obrolan
bbb.presentation.uploadwindow.closeLabel = Klik OK untuk menutup jendela
bbb.viewers.title = Pengguna {0} {1}
bbb.settings.flash.label = Kesalahan pada versi Flash
bbb.presentation.ok = OK
bbb.mainToolbar.helpBtn = Help
bbb.mainToolbar.helpBtn = Bantuan
bbb.fileupload.showBtn = Tampilkan
bbb.fileupload.fileLbl = File:
bbb.toolbar.deskshare.toolTip = Bagikan Desktop saya
bbb.mainshell.copyrightLabel2 = (c) 2011, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
bbb.listenerItem.talkImg.toolTip = Berbicara
bbb.settings.warning.label = Peringatan
bbb.mainshell.copyrightLabel2 = (c) 2011, BigBlueButton build {0} - Untuk informasi lebih lanjut, kunjungi http://www.bigbluebutton.org/.
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
bbb.toolbar.video.toolTip = Bagikan Video saya
bbb.chat.publicMsgAwaiting = Pesan publik sedang menunggu
bbb.settings.instructions = Terima konfirmasi Flash yang meminta izin atas kamera anda. Jika anda bisa melihat dan mendengar diri anda sendiri berarti peramban anda sudah diatur dengan benar. Masalah yang potensial lainnya ditampilkan di bawah. Klik untuk menemukan solusi yang mungkin dari masing-masing masalah.
bbb.chat.sendBtn = Kirim
bbb.publishVideo.title = Bagikan Video Anda
bbb.presentation.uploadPresBtn = Upload dokumen untuk presentasi.
bbb.presentation.uploadPresBtn.toolTip = Upload dokumen untuk presentasi.
bbb.logout.appshutdown = Server aplikasi telah dimatikan
bbb.presentation.uploadPresBtn = Unggah sebuah dokumen untuk presentasi.
bbb.presentation.uploadPresBtn.toolTip = Unggah sebuah dokumen untuk presentasi.
bbb.highlighter.toolbar.ellipse = Lingkaran
bbb.fileupload.deleteBtn.toolTip = Hapus Presentasi
bbb.listenerItem.talkImg.toolTip = Percakapan
bbb.toolbar.deskshare.toolTip = Bagikan Desktop saya
bbb.presentation.document.converted = Berhasil Mengkonversi Dokumen Office.
bbb.presentation.error.convert.maxnbpagereach = Error: Dokumen-upload memiliki terlalu banyak halaman.
bbb.presentation.error.convert.maxnbpagereach = Error: Dokumen yang diunggah memiliki terlalu banyak halaman.
bbb.desktopView.title = Berbagi Desktop
bbb.settings.java.label = Versi Java bermasalah
bbb.presentation.forwardBtn.toolTip = Slide selanjutnya
bbb.fileupload.genThumbText = Generating thumbnails..
bbb.desktopPublish.title = Berbagi Desktop: Pratinjau Prsenter
bbb.fileupload.uploadBtn = Upload
bbb.fileupload.uploadBtn.toolTip = Upload file
bbb.fileupload.showBtn.toolTip = Tampilkan
bbb.settings.java.text = Anda memiliki Java {0} yang terpasang, tapi anda membutuhkan paling tidak bersi {1} untuk dapat menggunakan fitur berbagi desktop. Klik pada tombol di bawah untuk memasang versi Java JRE terbaru.
bbb.fileupload.genThumbText = Sedang membangun thumbnails
bbb.viewers.viewersGrid.statusItemRenderer = Status
bbb.desktopPublish.title = Berbagi Desktop: Pratinjau Presenter
bbb.mainToolbar.settingsBtn = Pengaturan
bbb.fileupload.uploadBtn = Unggah
bbb.fileupload.uploadBtn.toolTip = Unggah file
bbb.fileupload.showBtn.toolTip = Tampilkan Presentasi
bbb.listeners.muteAllBtn.toolTip = Diam semua
bbb.video.publish.close.tooltip = Berhenti membagikan Video Anda
bbb.presentation.error.convert.nbpage = Error: Gagal menentukan jumlah halaman dalam dokumen yg diupload.
bbb.mainshell.locale.version = 0.71
bbb.chat.title = Chat
bbb.presentation.uploaded = Di upload.
bbb.mainshell.logBtn.toolTip = Open Log Window
bbb.desktopPublish.stop.tooltip = Tutup layar
bbb.chat.title = Obrolan
bbb.presentation.uploaded = Telah terunggah
bbb.mainshell.logBtn.toolTip = Buka Jendela Log
bbb.desktopPublish.stop.tooltip = Tutup layar berbagi
bbb.presentation.uploadwindow.excel = EXCEL
bbb.toolbar.video.toolTip = Bagikan Video saya
bbb.settings.voice.volume = Aktifitas Mikrofon
bbb.logout.unknown = Klien anda telah kehilangan hubungan ke server.
bbb.presentation.slideNumLbl.toolTip = Klik untuk pilih slide
bbb.settings.flash.text = Anda sudah memiliki Flash {0} yang terpasang, tapi anda membutuhkan paling tidak versi {1} untuk dapat menjalankan BigBlueButton dengan baik. Klik tombol di bawah untuk memasang versi Adobe Flash terbaru.
bbb.highlighter.toolbar.rectangle = Bujur sangkar
bbb.viewers.viewersGrid.statusItemRenderer = Status
bbb.settings.voice.adjust = Atur Suara
bbb.presentation.uploadwindow.word = WORD
bbb.mainshell.statusProgress.loading = Loading {0} modules
bbb.presentation.error.io = IO Error: Silahkan Hubungi Administrator.
bbb.chat.sendBtn.toolTip = Kirim Pesan
bbb.highlighter.button.toolTipHide = Sembunyikan papan presentasi
bbb.mainToolbar.logoutBtn = Logout
bbb.highlighter.toolbar.color = Pilih warna
bbb.settings.java.command = Pasang Java yang terbaru
bbb.mainToolbar.logoutBtn = Keluar
bbb.chat.privateMsgAwaiting2 = * Pesan pribadi sedang menunggu *
bbb.presentation.document.supported = Upload Dokumen dibolehkan, Sedang Menkonversi...
bbb.presentation.document.supported = Dokumen yang diunggah didukung. Sedang memulai konversi...
bbb.listeners.title = Pendengar{0} {1}
bbb.fileupload.presentationNamesLbl = Uploaded Presentasi:
bbb.fileupload.presentationNamesLbl = Unggah Presentasi:
bbb.pageTitle = BigBlueButton
bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
bbb.mainshell.resetLayoutBtn.toolTip = Atur Ulang Tampilan
bbb.highlighter.toolbar.color = Pilih warna
bbb.presentation.uploadwindow.pdf = PDF
bbb.publishVideo.startPublishBtn.toolTip = Mulai Berbagi
bbb.logout.connectionfailed = Hubungan ke server gagal
bbb.settings.isight.text = Jika anda punya masalah dengan iSight kamera, mungkin karena anda menjalankan OS X 10.6.5, yang diketahui bermasalah pada penangkapan video Flash dari kamera iSight.\r\nUntuk memperbaiki hal ini, klik pada link di bawah untuk memasang versi Flash player yang lebih baru, atau update Mac anda ke versi terbaru
bbb.highlighter.toolbar.clear = Bersihkan halaman
bbb.toolbar.phone.toolTip = Bagikan Voice saya
bbb.chat.privateChatSelect = Pilih orang untuk chat pribadi
bbb.toolbar.phone.toolTip = Bagikan mikrofon saya
bbb.chat.privateChatSelect = Pilih seseorang untuk obrolan pribadi
bbb.fileupload.okCancelBtn = Batal
bbb.video.publish.close.label = Keluar
bbb.desktopPublish.stop.label = Keluar
bbb.presentation.presenterNameLbl = {0} Sedang Berpresentasi
bbb.video.publish.close.label = Tutup
bbb.desktopPublish.stop.label = Tutup
bbb.logout.asyncerror = Terjadi Masalah sinkronisasi
bbb.presentation.presenterNameLbl = {0} Sedang mempresentasikan.
bbb.chat.privateMsgAwaiting = Pesan pribadi sedang menunggu
bbb.desktopView.fitToWindow = Sesuaikan ke jendela
bbb.highlighter.toolbar.pencil = Stabilo
bbb.mainshell.statusProgress.connecting = Menghubungi Server
bbb.listenerItem.lockImg.toolTip = Klik untuk tetap dinonaktifkan atau kembali terdengar
bbb.highlighter.toolbar.pencil = Penyorot
bbb.mainshell.statusProgress.connecting = Sedang membuat hubungan ke server
bbb.listenerItem.lockImg.toolTip = Klik untuk mengaktifkan atau menonaktifkan suara
bbb.listeners.unmuteAllBtn.toolTip = Bersuara
bbb.logout.rejected = Hubungan ke server ditolak
bbb.presentation.title = Presentasi
bbb.settings.noissues = Tidak ada masalah terkemuka yang terdeteksi.
bbb.desktopPublish.closeBtn.toolTip = Berhenti berbagi dan tutup jendela ini.
bbb.fileupload.selectBtn.toolTip = Browse file
bbb.presentation.uploadwindow.image = IMAGE
bbb.fileupload.selectBtn.toolTip = Melihat-lihat file
bbb.presentation.uploadwindow.image = Citra
bbb.settings.warning.close = Tutup peringatan ini
bbb.presentation.clickToUpload = Upload presentasi
bbb.presentation.clickToUpload = Unggah presentasi
bbb.presentation.backBtn.toolTip = Slide Sebelumnya
bbb.desktopPublish.fullscreen.tooltip = Bebagi seluruh layar anda
bbb.desktopPublish.fullscreen.tooltip = Bagikan seluruh layar anda
bbb.settings.isight.command = Pasang Flash 10.2.RC2
bbb.presentation.error.document.convert.failed = Error: Gagal Mengkonversi Dokumen Office.
bbb.viewers.viewersGrid.nameItemRenderer = Jabatan
bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton.
bbb.highlighter.button.toolTipShow = Show Whiteboard
bbb.viewers.viewersGrid.nameItemRenderer.nameLabel.toolTip = Anda Login Sebagai User ini.
bbb.viewers.viewersGrid.nameItemRenderer = Nama
bbb.oldlocalewindow.reminder1 = Penerjamah bahasa dari BigBlueButton anda mungkin sudah lawas
bbb.highlighter.button.toolTipShow = Tampilkan Papantulis
bbb.settings.deskshare.start = Periksa fitur Berbagi Desktop.
bbb.viewers.viewersGrid.nameItemRenderer.nameLabel.toolTip = Anda masuk sebagai pengguna ini.
bbb.chat.fontSize = Ukuran Huruf
bbb.presentation.resetZoomBtn.toolTip = Reset Zoom
bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
bbb.presentation.resetZoomBtn.toolTip = Atur kembali pembesaran
bbb.mainshell.statusProgress.cannotConnectServer = Maaf, tidak dapat terhubung ke server.
bbb.logout.connectionclosed = Hubungan ke server telah tertutup
bbb.chat.publicChatUsername = Semua
bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = Presenter
bbb.mainToolbar.logoutBtn.toolTip = Log out
bbb.presentation.error.convert.notsupported = Error: Upload dokumen tidak di dukung. Silahkan upload file yg kompatibel.
bbb.settings.isight.label = Terjadi kesalahan pada kamera iSight
bbb.mainToolbar.logoutBtn.toolTip = Keluar
bbb.presentation.error.convert.notsupported = Error: Dokumen yang diunggah tidak didukung. Harap unggah file yang kompatibel
bbb.highlighter.toolbar.thickness = Ubah ketebalan
bbb.presentation.uploadwindow.presentationfile = Data Presentasi
bbb.viewers.raiseHandBtn.toolTip = Klik untuk mengangkat tangan.

View File

@ -12,7 +12,7 @@ bbb.viewers.presentBtn.toolTip = Wybierz uczestnika, który poprowadzi prezentac
bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip = Kliknij podwójnie, aby wyświetlić.
bbb.highlighter.toolbar.undo = Cofnij
bbb.desktopPublish.minimizeBtn.toolTip = Minimalizuj okno.
bbb.viewers.presentBtn.label = Przełącz Prezentera
bbb.viewers.presentBtn.label = Ustaw Prezentera
bbb.viewers.kickUserBtn.toolTip = Usuń użytkownika
bbb.listeners.ejectTooltip = Usuń użytkownika
bbb.presentation.uploadcomplete = Wgrywanie na serwer zakończone. Konwertujemy dokument, proszę czekać.
@ -30,7 +30,7 @@ bbb.chat.cmpColorPicker.toolTip = Kolor tekstu
bbb.listenerItem.muteUnmute.toolTip = Wycisz, lub cofnij wyciszenie słuchacza
bbb.chat.chatOptions = Opcje czatu
bbb.presentation.uploadwindow.closeLabel = Naciśnij OK aby zamknąć okno
bbb.viewers.title = Użytkownocy{0} {1}
bbb.viewers.title = Użytkownicy {0} {1}
bbb.settings.flash.label = Błędna wersja Flash
bbb.presentation.ok = OK
bbb.mainToolbar.helpBtn = Pomoc
@ -56,7 +56,7 @@ bbb.presentation.error.convert.maxnbpagereach = Błąd: wgrany dokument ma zbyt
bbb.desktopView.title = Współdzielenie pulpitu
bbb.settings.java.label = Błąd wersji komponentu Java
bbb.presentation.forwardBtn.toolTip = Następny slajd
bbb.settings.java.text = Zainstalowana wersja Javay to {0} . Do używania funkcji BigBlueButton Udostępniania Pulpitu wymagana wersja to {1} . Naciśnij przycisk znajdujący się poniżej, aby zainstalować najnowsza wersje Java JRE.
bbb.settings.java.text = Zainstalowana wersja Javy to {0} . Do używania funkcji BigBlueButton Udostępniania Pulpitu wymagana wersja to {1} . Naciśnij przycisk znajdujący się poniżej, aby zainstalować najnowsza wersje Java JRE.
bbb.fileupload.genThumbText = Tworzę miniatury..
bbb.viewers.viewersGrid.statusItemRenderer = Status
bbb.desktopPublish.title = Udostępnianie pulpitu: Podgląd prezentera
@ -88,7 +88,7 @@ bbb.settings.java.command = Zainstaluj najnowszą wersje Java
bbb.mainToolbar.logoutBtn = Wylogowanie
bbb.chat.privateMsgAwaiting2 = * Oczekuje prywatna wiadomość *
bbb.presentation.document.supported = Wgrany dokument jest obsługiwany. Zaczynam konwertować...
bbb.listeners.title = Słuchacze{0} {1}
bbb.listeners.title = Słuchacze {0} {1}
bbb.fileupload.presentationNamesLbl = Wgrane prezentacje:
bbb.pageTitle = BigBlueButton
bbb.mainshell.resetLayoutBtn.toolTip = Resetuj układ

View File

@ -24,18 +24,21 @@
uri="rtmp://HOST/bigbluebutton"
dependsOn="ViewersModule"
translationOn="true"
translationEnabled="true"
translationEnabled="true"
privateEnabled="true"
/>
<module name="ViewersModule" url="ViewersModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
host="http://HOST/bigbluebutton/api/enter"
allowKickUser="false"
visible="true"
/>
<module name="ListenersModule" url="ListenersModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
recordingHost="http://HOST"
visible="true"
/>
<module name="DeskShareModule"

View File

@ -25,36 +25,40 @@
xmlns:maps="org.bigbluebutton.main.maps.*"
xmlns:mate="http://mate.asfusion.com/"
pageTitle="BigBlueButton"
layout="absolute"
layout="absolute" creationComplete="init()"
preloader="org.bigbluebutton.main.model.BigBlueButtonPreloader">
<mx:Script>
<![CDATA[
import mx.managers.HistoryManager;
import org.bigbluebutton.main.views.MainApplicationShell;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var langResources:ResourceUtil = ResourceUtil.getInstance();
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.managers.ConfigManager2;
import mx.managers.HistoryManager;
/**
* Thse two lines are workaround for this. (ralam - Nov 8, 2008)
* http://gregjessup.com/flex-3-advanceddatagrid-cannot-convert-mxmanagersdragmanagerimpl-to-mxmanagersidragmanager/
* http://butterfliesandbugs.wordpress.com/2007/10/25/workaround-for-error-when-loading-popups-from-modules/
*/
import mx.managers.IDragManager;
private var iDragManager:IDragManager;
/** another workaround - for this issue: https://bugs.adobe.com/jira/browse/SDK-13121*/
private var hist:HistoryManager
private function handleChatEvent(e:Event):void {
trace('Got CHAT_EVENT');
}
import org.bigbluebutton.main.views.MainApplicationShell;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var langResources:ResourceUtil = ResourceUtil.getInstance();
/**
* Thse two lines are workaround for this. (ralam - Nov 8, 2008)
* http://gregjessup.com/flex-3-advanceddatagrid-cannot-convert-mxmanagersdragmanagerimpl-to-mxmanagersidragmanager/
* http://butterfliesandbugs.wordpress.com/2007/10/25/workaround-for-error-when-loading-popups-from-modules/
*/
import mx.managers.IDragManager;
private var iDragManager:IDragManager;
/** another workaround - for this issue: https://bugs.adobe.com/jira/browse/SDK-13121*/
private var hist:HistoryManager
private var configMgr:ConfigManager2 = BBB.initConfigManager();
private function init():void {
configMgr.loadConfig();
}
]]>
</mx:Script>
<maps:ApplicationEventMap />
<views:MainApplicationShell id="mainShell"/>
</mx:Application>

View File

@ -0,0 +1,53 @@
package org.bigbluebutton.core
{
import org.bigbluebutton.core.managers.ConfigManager2;
import org.bigbluebutton.core.managers.ConnectionManager;
import org.bigbluebutton.core.managers.StreamManager;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.core.model.Session;
public class BBB
{
private static var userManager:UserManager = null;
private static var configManager:ConfigManager2 = null;
private static var streamManager:StreamManager = null;
private static var connectionManager:ConnectionManager = null;
private static var session:Session = null;
public static function initUserManager():UserManager {
if (userManager == null) {
userManager = new UserManager();
}
return userManager;
}
public static function initConfigManager():ConfigManager2 {
if (configManager == null) {
configManager = new ConfigManager2();
configManager.loadConfig();
}
return configManager;
}
public static function initStreamManager():StreamManager {
if (streamManager == null) {
streamManager = new StreamManager();
}
return streamManager;
}
public static function initConnectionManager():ConnectionManager {
if (connectionManager == null) {
connectionManager = new ConnectionManager();
}
return connectionManager;
}
public static function initSession():Session {
if (session == null) {
session = new Session();
}
return session;
}
}
}

View File

@ -0,0 +1,32 @@
package org.bigbluebutton.core.managers
{
import flash.events.Event;
import flash.net.URLLoader;
import flash.net.URLRequest;
import org.bigbluebutton.core.model.Config;
public class ConfigManager2
{
private var _config:Config = null;
public function ConfigManager2()
{
}
public function loadConfig():void {
var urlLoader:URLLoader = new URLLoader();
urlLoader.addEventListener(Event.COMPLETE, handleComplete);
var date:Date = new Date();
urlLoader.load(new URLRequest("conf/config.xml" + "?a=" + date.time));
}
private function handleComplete(e:Event):void{
_config = new Config(new XML(e.target.data));
}
public function get config():Config {
return _config;
}
}
}

View File

@ -0,0 +1,10 @@
package org.bigbluebutton.core.managers
{
public class ConnectionManager
{
public function ConnectionManager()
{
}
}
}

View File

@ -0,0 +1,10 @@
package org.bigbluebutton.core.managers
{
public class StreamManager
{
public function StreamManager()
{
}
}
}

View File

@ -0,0 +1,10 @@
package org.bigbluebutton.core.managers
{
public class UserManager
{
public function UserManager()
{
}
}
}

View File

@ -0,0 +1,75 @@
package org.bigbluebutton.core.model
{
public class Config
{
private var config:XML = null;
public function Config(config:XML)
{
this.config = config;
}
public function get help():Object {
var help:Object = new Object();
help.url = config.help.@url;
return help;
}
public function get locale():Object {
var v:Object = new Object();
v.version = config.localeversion;
return v;
}
public function get version():String {
return config.version;
}
public function get porttest():Object {
var p:Object = new Object();
p.host = config.porttest.@host;
p.application = config.porttest.@application;
return p;
}
public function get application():Object {
var a:Object = new Object();
a.uri = config.application.@uri;
a.host = config.application.@host;
return a;
}
public function get language():Object {
var a:Object = new Object();
a.userSelectionEnabled = ((config.language.@userSelectionEnabled).toUpperCase() == "TRUE") ? true : false;
return a
}
public function get skinning():Object {
var a:Object = new Object();
a.enabled = ((config.skinning.@enabled).toUpperCase() == "TRUE") ? true : false;
a.url = config.skinning.@url;
return a
}
public function get debug():Object {
var a:Object = new Object();
a.showDebugWindow = ((config.debug.@showDebugWindow).toUpperCase() == "TRUE") ? true : false;
return a
}
public function isModulePresent(name:String):Boolean {
for each (var n:XML in config.modules..@name) {
if (n.toString().toUpperCase() == name.toUpperCase()) return true;
}
return false;
}
public function getModuleConfig(name:String):XML {
if (isModulePresent(name))
return new XML(config.modules.module.(@name.toUpperCase() == name.toUpperCase()).toXMLString());
return null;
}
}
}

View File

@ -0,0 +1,10 @@
package org.bigbluebutton.core.model
{
public class Session
{
public function Session()
{
}
}
}

View File

@ -1,63 +0,0 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
* Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 2.1 of the License, or (at your option) any later
* version.
*
* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
package org.bigbluebutton.modules.chat.managers
{
import flash.events.IEventDispatcher;
import org.bigbluebutton.common.LogUtil;
public class ChatManager
{
/** This property is injected by the application. */
public var dispatcher:IEventDispatcher;
private var attributes:Object;
public function ChatManager()
{
}
public function setModuleAttributes(attributes:Object):void {
this.attributes = attributes;
}
public function getDispatcher():IEventDispatcher {
return dispatcher;
}
public function receivedMessage():void {
trace("Got New Public Chat message");
}
public function receivedPrivateMessage():void {
trace("Got New Private Chat message");
}
public function receivedGlobalMessage():void {
trace("Got New Global Chat message");
}
public function receivedAppletStartedMessage():void {
LogUtil.debug("Got APPLET STARTED message");
}
public function receivedSendPublicChatMessageEvent():void {
trace("Receive receivedSendPublicChatMessageEvent");
}
}
}

View File

@ -39,7 +39,6 @@
import org.bigbluebutton.modules.chat.events.StartChatModuleEvent;
import org.bigbluebutton.modules.chat.events.StopChatModuleEvent;
import org.bigbluebutton.modules.chat.events.TranscriptEvent;
import org.bigbluebutton.modules.chat.managers.ChatManager;
import org.bigbluebutton.modules.chat.services.PrivateChatService;
import org.bigbluebutton.modules.chat.services.PublicChatService;
import org.bigbluebutton.modules.chat.views.ChatView;
@ -48,14 +47,11 @@
<EventHandlers type="{FlexEvent.PREINITIALIZE}">
<ObjectBuilder generator="{ChatEventMapDelegate}" constructorArguments="{scope.dispatcher}"/>
<ObjectBuilder generator="{ChatManager}" />
<ObjectBuilder generator="{PublicChatService}" />
<ObjectBuilder generator="{PrivateChatService}" />
<ObjectBuilder generator="{PrivateChatService}" />
</EventHandlers>
<EventHandlers type="{StartChatModuleEvent.START_CHAT_MODULE_EVENT}">
<MethodInvoker generator="{ChatManager}" method="setModuleAttributes" arguments="{event.attributes}"/>
<MethodInvoker generator="{PublicChatService}" method="setModuleAttributes" arguments="{event.attributes}" />
<MethodInvoker generator="{PublicChatService}" method="join"/>
<MethodInvoker generator="{PrivateChatService}" method="setModuleAttributes" arguments="{event.attributes}" />
@ -85,11 +81,7 @@
<EventHandlers type="{QueryParticipantsEvent.QUERY_PARTICIPANTS_EVENT}">
<MethodInvoker generator="{PrivateChatService}" method="queryForParticipants"/>
</EventHandlers>
<EventHandlers type="{ChatEvent.CHAT_EVENT}">
<MethodInvoker generator="{ChatManager}" method="receivedGlobalMessage" />
</EventHandlers>
<EventHandlers type="{TranscriptEvent.LOAD_TRANSCRIPT}" >
<MethodInvoker generator="{PublicChatService}" method="loadTranscript" />
</EventHandlers>

View File

@ -24,8 +24,10 @@ package org.bigbluebutton.modules.chat.maps {
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.common.events.CloseWindowEvent;
import org.bigbluebutton.common.events.OpenWindowEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.modules.chat.events.ChatOptionsEvent;
import org.bigbluebutton.modules.chat.events.StartChatModuleEvent;
import org.bigbluebutton.modules.chat.model.ChatOptions;
import org.bigbluebutton.modules.chat.views.ChatWindow;
import org.bigbluebutton.util.i18n.ResourceUtil;
@ -38,6 +40,7 @@ package org.bigbluebutton.modules.chat.maps {
private var translationEnabled:Boolean;
private var translationOn:Boolean;
private var chatOptions:ChatOptions = new ChatOptions();
public function ChatEventMapDelegate() {
this.dispatcher = dispatcher;
@ -45,8 +48,16 @@ package org.bigbluebutton.modules.chat.maps {
globalDispatcher = new Dispatcher();
}
public function openChatWindow():void {
LogUtil.debug("Opening Chat Window!!!! " + (_chatWindow != null));
private function getChatOptions():void {
var cxml:XML = BBB.initConfigManager().config.getModuleConfig("ChatModule");
if (cxml != null) {
chatOptions.privateEnabled = (cxml.@privateEnabled.toUpperCase() == "TRUE") ? true : false;
}
}
public function openChatWindow():void {
getChatOptions();
_chatWindow.chatOptions = chatOptions;
_chatWindow.title = ResourceUtil.getInstance().getString("bbb.chat.title");
_chatWindow.showCloseButton = false;
@ -60,6 +71,7 @@ package org.bigbluebutton.modules.chat.maps {
dispatchTranslationOptions();
}
public function closeChatWindow():void {

View File

@ -0,0 +1,19 @@
package org.bigbluebutton.modules.chat.model
{
public class ChatOptions
{
[Bindable]
public var translationOn:Boolean = false;
[Bindable]
public var translationEnabled:Boolean = false;
[Bindable]
public var privateEnabled:Boolean = false;
public function ChatOptions()
{
}
}
}

View File

@ -26,6 +26,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.modules.chat.model.ChatOptions;
import com.adobe.utils.StringUtil;
import mx.collections.ArrayCollection;
@ -40,6 +41,8 @@
[Bindable] public var chatView:ChatView;
[Bindable] private var fontSizes:Array = ['8', '10', '12', '14', '16', '18'];
[Bindable] public var chatOptions:ChatOptions = new ChatOptions();
[Bindable] private var langNames:Array=[
'AFRIKAANS' ,
'ALBANIAN' ,
@ -222,7 +225,7 @@
</mx:Script>
<mx:HBox width="100%" height="100%" >
<mx:VBox height="100%" width="50%">
<mx:VBox height="100%" width="50%" visible="{chatOptions.privateEnabled}">
<mx:Label id="lblSelect" text="{ResourceUtil.getInstance().getString('bbb.chat.privateChatSelect')}" />
<mx:List id="participantsList" height="100%" width="100%" dataProvider="{chatView.participants}" change="openPrivateChat(event)">
</mx:List>

View File

@ -56,6 +56,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.modules.chat.model.ChatOptions;
import be.boulevart.google.ajaxapi.translation.GoogleTranslation;
import be.boulevart.google.events.GoogleApiEvent;
@ -103,6 +104,7 @@
private var autoTranslation:Boolean=false;
private var currentLangCode:String="en";
[Bindable] public var chatOptions:ChatOptions;
[Bindable]
public var participants:ArrayCollection = new ArrayCollection();
@ -357,6 +359,7 @@
tabBox.id = TAB_BOX_ID;
tabBox.label = TAB_BOX_ID;
tabBox.name = TAB_BOX_ID;
tabBox.chatOptions = chatOptions;
chatTabs.addChild(tabBox);
return tabBox;

View File

@ -30,6 +30,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.modules.chat.model.ChatOptions;
import com.asfusion.mate.events.Dispatcher;
import flexlib.mdi.events.MDIWindowEvent;
@ -47,6 +48,7 @@
private var _yPosition:int;
private var dispState:String;
[Bindable] public var chatOptions:ChatOptions;
public function getPrefferedPosition():String{
return MainCanvas.RIGHT;
@ -83,5 +85,5 @@
]]>
</mx:Script>
<views:ChatView id="chatView"/>
<views:ChatView id="chatView" chatOptions="{chatOptions}"/>
</MDIWindow>

View File

@ -22,7 +22,9 @@ package org.bigbluebutton.modules.listeners.managers
import org.bigbluebutton.common.events.CloseWindowEvent;
import org.bigbluebutton.common.events.OpenWindowEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.modules.listeners.events.StartListenersModuleEvent;
import org.bigbluebutton.modules.listeners.model.ListenerOptions;
import org.bigbluebutton.modules.listeners.views.ListenersWindow;
public class ListenersManager
@ -31,13 +33,24 @@ package org.bigbluebutton.modules.listeners.managers
private var dispatcher:Dispatcher;
private var listenersWindow:ListenersWindow;
[Bindable]
public var listenerOptions:ListenerOptions;
public function ListenersManager(){
dispatcher = new Dispatcher();
listenerOptions = new ListenerOptions();
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("ListenersModule");
if (vxml != null) {
listenerOptions.visible = (vxml.@visible.toUpperCase() == "TRUE") ? true : false;
}
}
public function moduleStarted(event:StartListenersModuleEvent):void{
if (listenersWindow == null){
listenersWindow = new ListenersWindow();
listenersWindow.listenerOptions = listenerOptions;
var e:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
e.window = listenersWindow;
dispatcher.dispatchEvent(e);

View File

@ -0,0 +1,13 @@
package org.bigbluebutton.modules.listeners.model
{
public class ListenerOptions
{
[Bindable]
public var visible:Boolean = true;
public function ListenerOptions()
{
}
}
}

View File

@ -32,6 +32,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.modules.listeners.model.ListenerOptions;
import flash.events.MouseEvent;
import flexlib.mdi.events.MDIWindowEvent;
@ -61,9 +62,12 @@
[Bindable] public var moderator:Boolean;
[Bindable] private var windowTitle:String = ResourceUtil.getInstance().getString('bbb.listeners.title', ["",""]);
[Bindable] public var listenerOptions:ListenerOptions;
private function onCreationComplete():void {
BindingUtils.bindSetter(updateNumberOfListeners, listeners, "length");
BindingUtils.bindSetter(updateNumberOfListeners, listeners, "length");
this.visible = listenerOptions.visible;
}
private function updateNumberOfListeners(numListeners:int):void {

View File

@ -20,12 +20,12 @@ package org.bigbluebutton.modules.viewers.managers
{
import com.asfusion.mate.events.Dispatcher;
import mx.controls.Alert;
import org.bigbluebutton.common.events.CloseWindowEvent;
import org.bigbluebutton.common.events.OpenWindowEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.modules.viewers.events.ViewersModuleEndEvent;
import org.bigbluebutton.modules.viewers.events.ViewersModuleStartedEvent;
import org.bigbluebutton.modules.viewers.model.ViewerOptions;
import org.bigbluebutton.modules.viewers.views.ViewersWindow;
public class ViewersManager
@ -34,9 +34,17 @@ package org.bigbluebutton.modules.viewers.managers
private var dispatcher:Dispatcher;
private var _module:ViewersModule;
[Bindable]
private var viewerOptions:ViewerOptions;
public function ViewersManager(){
dispatcher = new Dispatcher();
viewerOptions = new ViewerOptions();
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("ViewersModule");
if (vxml != null) {
viewerOptions.visible = (vxml.@visible.toUpperCase() == "TRUE") ? true : false;
}
}
public function moduleStarted(e:ViewersModuleStartedEvent):void{
@ -44,6 +52,8 @@ package org.bigbluebutton.modules.viewers.managers
if (viewersWindow == null){
viewersWindow = new ViewersWindow();
viewersWindow.viewerOptions = viewerOptions;
var windowEvent:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
windowEvent.window = viewersWindow;
dispatcher.dispatchEvent(windowEvent);

View File

@ -0,0 +1,13 @@
package org.bigbluebutton.modules.viewers.model
{
public class ViewerOptions
{
[Bindable]
public var visible:Boolean = false;
public function ViewerOptions()
{
}
}
}

View File

@ -32,6 +32,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.modules.viewers.model.ViewerOptions;
import com.asfusion.mate.events.Dispatcher;
import flexlib.mdi.events.MDIWindowEvent;
@ -68,6 +69,8 @@
[Bindable] public var presenterIcon : Class = images.presenter;
[Bindable] public var handIcon:Class = images.raisehand;
[Bindable] public var viewerOptions:ViewerOptions;
private var dispatcher:Dispatcher;
private function onCreationComplete():void {
@ -76,6 +79,8 @@
this.isModerator = (conference.me.role == Role.MODERATOR);
BindingUtils.bindSetter(updateNumberOfViewers, participants, "length");
dispatcher = new Dispatcher();
this.visible = viewerOptions.visible;
}
private function updateNumberOfViewers(numViewers:int):void {

View File

@ -242,6 +242,10 @@ comment () {
sed -i "s<^[[:blank:]]*\(${2}.*\)<#\1<" $1
}
change_yml_value () {
sed -i "s<^[[:blank:]#]*\(${2}\):[ ].*<\1: ${3}<" $1
}
# comment lines matching $2 ($1 is the file)
uncomment () {
check_and_backup $1
@ -1269,7 +1273,7 @@ if [ $CHECK ]; then
echo " Memory: $MEM MB"
echo
echo "/var/www/bigbluebutton/client/conf/config.xml"
echo "/var/www/bigbluebutton/client/conf/config.xml (bbb-client)"
PORT_IP=$(cat /var/www/bigbluebutton/client/conf/config.xml | sed -n '/porttest /{s/.*host="//;s/".*//;p}')
echo " Port test (tunnel): $PORT_IP"
@ -1280,7 +1284,7 @@ if [ $CHECK ]; then
# echo " host for bbb-web interface: $HOST"
echo
echo "/etc/nginx/sites-available/bigbluebutton"
echo "/etc/nginx/sites-available/bigbluebutton (nginx)"
NGINX_IP=$(cat /etc/nginx/sites-available/bigbluebutton | sed -n '/server_name/{s/.*name[ ]*//;s/;//;p}')
echo " server name: $NGINX_IP"
@ -1309,9 +1313,17 @@ if [ $CHECK ]; then
fi
echo
echo "/usr/share/red5/webapps/bigbluebutton/WEB-INF/red5-web.xml"
echo "/usr/share/red5/webapps/bigbluebutton/WEB-INF/red5-web.xml (red5)"
echo " voice conference: $CONFERENCING_MODULE"
if [ -f /usr/local/bigbluebutton/core/scripts/simple.yml ]; then
PLAYBACK_IP=$(cat /usr/local/bigbluebutton/core/scripts/simple.yml | sed -n '/playback_host/{s/.*:[ ]*//;s/;//;p}')
echo
echo "/usr/local/bigbluebutton/core/scripts/simple.yml (record and playback)"
echo " playback host: $NGINX_IP"
fi
#SIP_SERVER_HOST=$(cat /usr/share/red5/webapps/sip/WEB-INF/bigbluebutton-sip.properties | sed -n '/sip.server.host=/{s/.*=//;s/;//;p}')
#echo
#echo "/usr/share/red5/webapps/sip/WEB-INF/bigbluebutton-sip.properties"
@ -1589,6 +1601,12 @@ if [ -n "$HOST" ]; then
sudo sed -i "s/BigBlueButtonURL = \"http:\/\/\([^\"\/]*\)\([\"\/]\)/BigBlueButtonURL = \"http:\/\/$HOST\2/g" \
${SERVLET_DIR}/bigbluebutton/demo/bbb_api_conf.jsp
fi
if [ -f /usr/local/bigbluebutton/core/scripts/simple.yml ]; then
echo "Assigning $HOST for record and playback in /usr/local/bigbluebutton/core/scripts/simple.yml"
change_yml_value /usr/local/bigbluebutton/core/scripts/simple.yml $redis_host playback_host $HOST
fi
#
# Update Freeswitch config

View File

@ -90,7 +90,7 @@ securitySalt=e49e0123e531d0816abaf4bc1b1d7f11
# Directory where we drop the <meeting-id-recorded>.done file
recordStatusDir=/var/bigbluebutton/recording/status/recorded
redisHost=localhost
redisHost=127.0.0.1
redisPort=6379
# The directory where the published/unpublised recordings are located. This is for

View File

@ -194,7 +194,7 @@ class ApiController {
String role = null;
if (meeting.getModeratorPassword().equals(attPW)) {
role = ROLE_MODERATOR;
} else if (meeting.getAttendeePassword().equals(attPW)) {
} else if (meeting.getViewerPassword().equals(attPW)) {
role = ROLE_ATTENDEE;
}

View File

@ -42,12 +42,12 @@ public class ParamsProcessorUtil {
String keyword = (String) itr.next();
if (keyword.equals(DIAL_NUM)) {
welcomeMessage = welcomeMessage.replaceAll(DIAL_NUM, dialNumber);
} else if (keyword.equals(CONF_NUM)) {
welcomeMessage = welcomeMessage.replaceAll(CONF_NUM, telVoice);
} else if (keyword.equals(CONF_NUM)) {
welcomeMessage = welcomeMessage.replaceAll(CONF_NUM, telVoice);
} else if (keyword.equals(CONF_NAME)) {
welcomeMessage = welcomeMessage.replaceAll(CONF_NAME, meetingName);
}
}
}
return welcomeMessage;
}

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -5,7 +5,7 @@ raw_audio_src: /var/freeswitch/meetings
raw_video_src: /usr/share/red5/webapps/video/streams
raw_deskshare_src: /var/bigbluebutton/deskshare
raw_presentation_src: /var/bigbluebutton
redis_host: 192.168.0.166
redis_host: 127.0.0.1
redis_port: 6379

View File

@ -82,7 +82,7 @@ if (playback == "simple")
metadata = BigBlueButton::Events.get_meeting_metadata("#{publish_dir}/#{d}/events.xml")
recordings << {:rec_time => rec_time, :link => play_link, :title => metadata['title']}
recordings << {:rec_time => rec_time, :link => play_link, :title => metadata['title'].nil? ? metadata['meetingId'] : metadata['title']}
end
end
@ -105,5 +105,6 @@ if (playback == "simple")
index_html = File.new("#{publish_dir}/index.html","w")
index_html.write(html)
index_html.close
File.chmod(0644, "#{publish_dir}/index.html")
end
end
end