Add setting to change jitsi URL prefix

pull/5393/head
Diego Sampaio 9 years ago
parent 270c64c161
commit 358402ca10
No known key found for this signature in database
GPG Key ID: E060152B30502562
  1. 1
      packages/rocketchat-i18n/i18n/en.i18n.json
  2. 1
      packages/rocketchat-i18n/i18n/pt.i18n.json
  3. 2
      packages/rocketchat-livechat/server/methods/startVideoCall.js
  4. 2
      packages/rocketchat-videobridge/client/views/videoFlexTab.js
  5. 10
      packages/rocketchat-videobridge/server/settings.js

@ -1377,6 +1377,7 @@
"Uploading_file": "Uploading file...",
"Uptime": "Uptime",
"URL": "URL",
"URL_room_prefix": "URL room prefix",
"Use_account_preference": "Use account preference",
"Use_Emojis": "Use Emojis",
"Use_Global_Settings": "Use Global Settings",

@ -1177,6 +1177,7 @@
"Uploading_file": "Subindo arquivo...",
"Uptime": "Tempo online",
"URL": "URL",
"URL_room_prefix": "Prefixo da URL da sala",
"Use_account_preference": "Use preferências da conta",
"Use_Emojis": "Usar Emojis",
"Use_initials_avatar": "Usar as iniciais do seu nome de usuário",

@ -27,7 +27,7 @@ Meteor.methods({
return {
roomId: room._id,
domain: RocketChat.settings.get('Jitsi_Domain'),
jitsiRoom: 'RocketChat' + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString()
jitsiRoom: RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString()
};
}
});

@ -39,7 +39,7 @@ Template.videoFlexTab.onCreated(function() {
let roomId = Session.get('openedRoom');
let domain = RocketChat.settings.get('Jitsi_Domain');
let jitsiRoom = 'RocketChat' + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString();
let jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString();
let noSsl = RocketChat.settings.get('Jitsi_SSL') ? false : true;
if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {

@ -17,6 +17,16 @@ Meteor.startup(function() {
public: true
});
this.add('Jitsi_URL_Room_Prefix', 'RocketChat', {
type: 'string',
enableQuery: {
_id: 'Jitsi_Enabled',
value: true
},
i18nLabel: 'URL_room_prefix',
public: true
});
this.add('Jitsi_SSL', true, {
type: 'boolean',
enableQuery: {

Loading…
Cancel
Save