Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutt…

…on into merge-25-dev

bbb-playback.placeholder.sh

@@ -1 +1 @@
-git clone --branch v3.4.0 --depth 1 https://github.com/bigbluebutton/bbb-playback bbb-playback
+git clone --branch v3.4.1 --depth 1 https://github.com/bigbluebutton/bbb-playback bbb-playback

bigbluebutton-config/bin/bbb-conf

@@ -658,8 +658,10 @@ fi
 
 if [[ $SECRET ]]; then
     need_root
-    if get_properties_value securitySalt "$BBB_WEB_ETC_CONFIG" > /dev/null ; then
-        change_var_salt "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET"
+
+    echo "Assigning secret in $BBB_WEB_ETC_CONFIG"
+    if [ -f "$BBB_WEB_ETC_CONFIG" ] && grep "^securitySalt" "$BBB_WEB_ETC_CONFIG" > /dev/null ; then
+        change_var_value "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET"
     else
         echo "securitySalt=$SECRET" >> "$BBB_WEB_ETC_CONFIG"
     fi
@@ -1612,7 +1614,7 @@ if [ -n "$HOST" ]; then
     if [ -f "$BBB_WEB_ETC_CONFIG" ] && grep "bigbluebutton.web.serverURL" "$BBB_WEB_ETC_CONFIG" > /dev/null ; then
         change_var_value "$BBB_WEB_ETC_CONFIG" bigbluebutton.web.serverURL "$PROTOCOL://$HOST"
     else
-        echo "bigbluebutton.web.serverURL=$PROTOCOL://$HOST" > "$BBB_WEB_ETC_CONFIG"
+        echo "bigbluebutton.web.serverURL=$PROTOCOL://$HOST" >> "$BBB_WEB_ETC_CONFIG"
     fi
 
 

bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js

@@ -140,10 +140,13 @@ export default function addMeeting(meeting) {
   const sanitizeTextInChat = original => SanitizeHTML(original, {
     allowedTags: ['a', 'b', 'br', 'i', 'img', 'li', 'small', 'span', 'strong', 'u', 'ul'],
     allowedAttributes: {
-      a: ['href', 'name', 'target'],
+      a: ['href', 'target'],
       img: ['src', 'width', 'height'],
     },
     allowedSchemes: ['https'],
+    allowedSchemesByTag: {
+      a: ['https', 'mailto', 'tel']
+    }
   });
 
   const sanitizedWelcomeText = sanitizeTextInChat(welcomeMsg);
@@ -154,14 +157,18 @@ export default function addMeeting(meeting) {
 
   const insertBlankTarget = (s, i) => `${s.substr(0, i)} target="_blank"${s.substr(i)}`;
   const linkWithoutTarget = new RegExp('<a href="(.*?)">', 'g');
-  linkWithoutTarget.test(welcomeMsg);
 
-  if (linkWithoutTarget.lastIndex > 0) {
-    welcomeMsg = insertBlankTarget(
-      welcomeMsg,
-      linkWithoutTarget.lastIndex - 1,
-    );
-  }
+  do {
+    linkWithoutTarget.test(welcomeMsg);
+
+    if (linkWithoutTarget.lastIndex > 0) {
+      welcomeMsg = insertBlankTarget(
+        welcomeMsg,
+        linkWithoutTarget.lastIndex - 1,
+      );
+      linkWithoutTarget.lastIndex = linkWithoutTarget.lastIndex - 1;
+    }
+  } while (linkWithoutTarget.lastIndex > 0);
 
   newMeeting.welcomeProp.welcomeMsg = welcomeMsg;
 

bigbluebutton-html5/imports/ui/components/app/component.jsx

@@ -156,6 +156,8 @@ class App extends Component {
       isRTL,
       hidePresentation,
       autoSwapLayout,
+      shouldShowScreenshare,
+      shouldShowExternalVideo,
     } = this.props;
     const { browserName } = browserInfo;
     const { osName } = deviceInfo;
@@ -167,9 +169,12 @@ class App extends Component {
       value: isRTL,
     });
 
+    const presentationOpen = !(autoSwapLayout || hidePresentation)
+      || shouldShowExternalVideo || shouldShowScreenshare;
+
     layoutContextDispatch({
       type: ACTIONS.SET_PRESENTATION_IS_OPEN,
-      value: !(autoSwapLayout || hidePresentation),
+      value: presentationOpen,
     });
 
     Modal.setAppElement('#app');

bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/styles.js

@@ -101,6 +101,7 @@ const Meta = styled.div`
   flex: 1;
   flex-flow: row;
   line-height: 1.35;
+  align-items: baseline;
 `;
 
 const Name = styled.div`

bigbluebutton-html5/imports/ui/components/pads/content/styles.js

@@ -17,6 +17,7 @@ color: ${colorGray};
 bottom: 0;
 box-sizing: border-box;
 display: flex;
+flex-direction: column;
 overflow-x: hidden;
 overflow-wrap: break-word;
 word-break: break-all;

bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx

@@ -301,14 +301,23 @@ class PresentationUploader extends Component {
         }
       });
 
-      if (!_.isEqual(prevProps.presentations, propPresentations) || presentations.length === 0) {
-        this.setState({
-          presentations: Object.values({
-            ...presentations,
-            ...propPresentations,
-          }),
-        });
-      }
+      const presState = Object.values({
+        ...propPresentations,
+        ...presentations,
+      });
+      const presStateMapped = presState.map((presentation) => {
+        propPresentations.forEach((propPres) => {
+          if (propPres.id == presentation.id){
+            presentation.isCurrent = propPres.isCurrent;
+          }
+        })
+        return presentation;
+      })
+
+      this.setState({
+        presentations: presStateMapped,
+      })
+
     }
 
     if (presentations.length > 0) {
@@ -857,7 +866,6 @@ class PresentationUploader extends Component {
               keyValue={item.id}
               onChange={() => this.handleCurrentChange(item.id)}
               disabled={disableActions}
-              animations={animations}
               />
             </Styled.ItemAction>
             {isRemovable ? (

bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/service.js

@@ -5,6 +5,7 @@ import Poll from '/imports/api/polls/';
 import { makeCall } from '/imports/ui/services/api';
 import logger from '/imports/startup/client/logger';
 import _ from 'lodash';
+import { Random } from 'meteor/random'
 
 const CONVERSION_TIMEOUT = 300000;
 const TOKEN_TIMEOUT = 5000;
@@ -155,7 +156,6 @@ const requestPresentationUploadToken = (
 });
 
 const uploadAndConvertPresentation = (
-  tmpPresId,
   file,
   downloadable,
   podId,
@@ -165,9 +165,9 @@ const uploadAndConvertPresentation = (
   onProgress,
   onConversion,
 ) => {
+  const tmpPresId = _.uniqueId(Random.id(20))
+
   const data = new FormData();
-  data.append('presentation_name', file.name);
-  data.append('Filename', file.name);
   data.append('fileUpload', file);
   data.append('conference', meetingId);
   data.append('room', meetingId);
@@ -209,7 +209,7 @@ const uploadAndConvertPresentations = (
   podId,
   uploadEndpoint,
 ) => Promise.all(presentationsToUpload.map((p) => uploadAndConvertPresentation(
-  p.id, p.file, p.isDownloadable, podId, meetingId, uploadEndpoint,
+  p.file, p.isDownloadable, podId, meetingId, uploadEndpoint,
   p.onUpload, p.onProgress, p.onConversion,
 )));