Merge pull request #188 from kaltura/KMS-18947-Krec---KAF-(Moodle-BB)…

…---Error-is-displayed-when-trying-to-add-new-webcam-recording-dev-34 KMS-18947 add iframe allow privilige for microphone and camera
kaltura · Jan 14, 2019 · 5aad7e8 · 5aad7e8
2 parents 8e79248 + a74102e
commit 5aad7e8
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/filter/kaltura/filter.php b/filter/kaltura/filter.php
@@ -202,7 +202,7 @@ function filter_kaltura_callback($link) {
         'height' => $height,
         'class' => 'kaltura-player-iframe',
         'allowfullscreen' => 'true',
-        'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+        'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
         'src' => $url->out(false),
         'frameborder' => '0'
     ));

diff --git a/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php b/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php
@@ -9,7 +9,7 @@
 
 ?>
 
-<iframe allow="autoplay *; fullscreen *; encrypted-media *" id="kafIframe" src="ltibrowse.php?<?php echo $requestQueryString; ?>" width="100%" height="600" style="border: 0;" allowfullscreen>
+<iframe allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;" id="kafIframe" src="ltibrowse.php?<?php echo $requestQueryString; ?>" width="100%" height="600" style="border: 0;" allowfullscreen>
 </iframe>
 <div id="kalturaMediaSubmitButton"></div>
 <script>

diff --git a/local/kaltura/attobsepreview.php b/local/kaltura/attobsepreview.php
@@ -42,7 +42,7 @@
     iframe.setAttribute('src', '<?php echo 'bsepreview_ltilaunch.php?playurl=' . urlencode($url); ?>');
     iframe.setAttribute('alt', '<?php echo addcslashes($title, "'"); ?>');
     iframe.setAttribute('allowfullscreen', '');
-    iframe.setAttribute('allow', 'autoplay *; fullscreen *; encrypted-media *');
+    iframe.setAttribute('allow', 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;');
     iframe.setStyles({
             height: '<?php echo $height; ?>px',
             border: 'none',

diff --git a/.../build/moodle-local_kaltura-ltitinymcepanel/moodle-local_kaltura-ltitinymcepanel-debug.js b/.../build/moodle-local_kaltura-ltitinymcepanel/moodle-local_kaltura-ltitinymcepanel-debug.js
@@ -77,7 +77,7 @@ Y.extend(LTITINYMCEPANEL, Y.Base, {
             this.contextid = Y.one('#lti_launch_context_id').get('value');
         }
 
-        var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *"></iframe>';
+        var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;"></iframe>';
         Y.one('#'+iframeid).setContent(content);
     },
 

diff --git a/local/kaltura/yui/src/ltitinymcepanel/js/ltitinymcepanel.js b/local/kaltura/yui/src/ltitinymcepanel/js/ltitinymcepanel.js
@@ -75,7 +75,7 @@ Y.extend(LTITINYMCEPANEL, Y.Base, {
             this.contextid = Y.one('#lti_launch_context_id').get('value');
         }
 
-        var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *"></iframe>';
+        var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;"></iframe>';
         Y.one('#'+iframeid).setContent(content);
     },
 

diff --git a/local/kalturamediagallery/index.php b/local/kalturamediagallery/index.php
@@ -57,7 +57,7 @@
     'width' => '100%',
     'allowfullscreen' => 'true',
     'src' => 'lti_launch.php?courseid='.$courseid,
-    'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+    'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
 );
 echo html_writer::tag('iframe', '', $attr);
 

diff --git a/local/mymedia/mymedia.php b/local/mymedia/mymedia.php
@@ -53,7 +53,7 @@
     'width' => '100%',
     'allowfullscreen' => 'true',
     'src' => 'lti_launch.php',
-    'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+    'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
 );
 echo html_writer::tag('iframe', '', $attr);
 

diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php
@@ -1032,7 +1032,7 @@ public function display_video_container_markup($submission, $courseid, $cmid) {
             'class' => 'kaltura-player-iframe',
             'src' => ($url instanceof moodle_url) ? $url->out(false) : '',
             'allowfullscreen' => 'true',
-            'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+            'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
             'height' => '100%',
             'width' => !empty($submission->width) ? $submission->width : ''
         );

diff --git a/mod/kalvidassign/single_submission_form.php b/mod/kalvidassign/single_submission_form.php
@@ -70,7 +70,7 @@ public function definition() {
                 'height' => $submission->height,
                 'width' => $submission->width,
                 'allowfullscreen' => 'true',
-                'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+                'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
             );
             $mform->addElement('html', html_writer::tag('iframe', '', $attr));
         }

diff --git a/mod/kalvidpres/mod_form.php b/mod/kalvidpres/mod_form.php
@@ -214,7 +214,7 @@ private function get_iframe_video_preview_markup($hide = true) {
             'height' => $height,
             'width' => $width,
             'allowfullscreen' => 'true',
-            'allow' => 'autoplay *; fullscreen *; encrypted-media *'
+            'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;'
         );
 
         if ($hide) {

diff --git a/mod/kalvidpres/renderer.php b/mod/kalvidpres/renderer.php
@@ -50,7 +50,7 @@ public function display_iframe($kalvidpres, $courseid) {
             'width' => $kalvidpres->width,
             'src' => $url->out(false),
             'allowfullscreen' => 'true',
-            'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+            'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
         );
 
         $output = html_writer::tag('iframe', '', $attr);

diff --git a/mod/kalvidres/mod_form.php b/mod/kalvidres/mod_form.php
@@ -207,7 +207,7 @@ private function get_iframe_video_preview_markup($hide = true) {
             'height' => $height,
             'width' => $width,
             'allowfullscreen' => 'true',
-            'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+            'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
         );
 
         if ($hide) {

diff --git a/mod/kalvidres/renderer.php b/mod/kalvidres/renderer.php
@@ -68,7 +68,7 @@ public function display_iframe($kalvidres, $courseid) {
             'width' => $kalvidres->width,
             'src' => $url->out(false),
             'allowfullscreen' => 'true',
-            'allow' => 'autoplay *; fullscreen *; encrypted-media *',
+            'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
         );
 
         $iframe = html_writer::tag('iframe', '', $attr);