diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php
index 5e272343..c288afd0 100644
--- a/filter/kaltura/version.php
+++ b/filter/kaltura/version.php
@@ -24,10 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2015021107;
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->version = 2015090707;
+$plugin->release = 'Kaltura release 4.0.07';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php
index 6eee95d8..a673cb34 100644
--- a/lib/editor/atto/plugins/kalturamedia/version.php
+++ b/lib/editor/atto/plugins/kalturamedia/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015021107;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->version   = 2015090707;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 'Kaltura release 4.0.07';
 $plugin->requires  = 2014050800;        // Requires this Moodle version.
 $plugin->component = 'atto_kalturamedia';  // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/lib/editor/tinymce/plugins/kalturamedia/tinymce/js/ltipopuplib.js b/lib/editor/tinymce/plugins/kalturamedia/tinymce/js/ltipopuplib.js
index f3e7b1e6..f0e33d62 100644
--- a/lib/editor/tinymce/plugins/kalturamedia/tinymce/js/ltipopuplib.js
+++ b/lib/editor/tinymce/plugins/kalturamedia/tinymce/js/ltipopuplib.js
@@ -45,7 +45,8 @@ function insertMedia() {
     var url = '';
     var parser = document.createElement('a');
     parser.href = form.source.value;
-    url = token + parser.pathname + parser.search;
+    var elementPathName = parser.pathname.charAt(0) == '/' ? parser.pathname : '/' + parser.pathname;
+    url = token + elementPathName + parser.search;
     var content = '<a href="http://'+url+'">tinymce-kalturamedia-embed||'+form.video_title.value+'||'+form.width.value+'||'+form.height.value+'</a>';
     ed.execCommand('mceInsertContent', false, content);
     tinyMCEPopup.close();
diff --git a/lib/editor/tinymce/plugins/kalturamedia/version.php b/lib/editor/tinymce/plugins/kalturamedia/version.php
index 12fee00d..26f15201 100644
--- a/lib/editor/tinymce/plugins/kalturamedia/version.php
+++ b/lib/editor/tinymce/plugins/kalturamedia/version.php
@@ -23,12 +23,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015021107;
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->version   = 2015090707;
+$plugin->release = 'Kaltura release 4.0.07';
 // Required Moodle version.
 $plugin->requires  = 2014050800;
 // Full name of the plugin (used for diagnostics).
 $plugin->component = 'tinymce_kalturamedia';
 $plugin->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/local/kaltura/attobsepreview.php b/local/kaltura/attobsepreview.php
index 86e909d3..50499198 100644
--- a/local/kaltura/attobsepreview.php
+++ b/local/kaltura/attobsepreview.php
@@ -26,8 +26,9 @@
 $PAGE->set_pagelayout('embedded');
 echo $OUTPUT->header();
 $playurl = urldecode($url);
+
+echo html_writer::tag('h2', get_string('preview', 'local_kaltura'));
 ?>
-<h2>Preview</h2>
 <div id="KalturaAttoPreview"></div>
 <script>
     var data = {
diff --git a/local/kaltura/db/upgrade.php b/local/kaltura/db/upgrade.php
index 8a372405..fe827e2d 100644
--- a/local/kaltura/db/upgrade.php
+++ b/local/kaltura/db/upgrade.php
@@ -59,13 +59,13 @@ function xmldb_local_kaltura_upgrade($oldversion) {
         }
 
         // Kaltura savepoint reached.
-        upgrade_plugin_savepoint(true, 2015021107, 'local', 'kaltura');
+        upgrade_plugin_savepoint(true, 2015090707, 'local', 'kaltura');
         $savePointDone = true;
     }
 
-    if (!$savePointDone && $oldversion < 2015021107) {
+    if (!$savePointDone && $oldversion < 2015090707) {
         // Kaltura savepoint reached.
-        upgrade_plugin_savepoint(true, 2015021107, 'local', 'kaltura');
+        upgrade_plugin_savepoint(true, 2015090707, 'local', 'kaltura');
     }
     return true;
 }
diff --git a/local/kaltura/download_log.php b/local/kaltura/download_log.php
index 8aeb35e3..338a5982 100644
--- a/local/kaltura/download_log.php
+++ b/local/kaltura/download_log.php
@@ -76,7 +76,8 @@
             $output = fopen('php://output', 'w');
 
             // output the column headings
-            fputcsv($output, array('Request/Response', 'Time', 'Module', 'Endpoint', 'Data (JSON)'));
+            fputcsv($output, array(get_string('request', 'local_kaltura'), get_string('time', 'local_kaltura'),
+                get_string('module', 'local_kaltura'), get_string('endpoint', 'local_kaltura'), get_string('data', 'local_kaltura')));
 
             foreach ($rs as $record) {
                 $record->data = json_encode(unserialize($record->data));
diff --git a/local/kaltura/lang/en/local_kaltura.php b/local/kaltura/lang/en/local_kaltura.php
index 4c3efb00..6a1f4566 100644
--- a/local/kaltura/lang/en/local_kaltura.php
+++ b/local/kaltura/lang/en/local_kaltura.php
@@ -27,9 +27,11 @@
 $string['admin_secret_desc'] = 'Enter the admin secret for your account.';
 $string['cancelbtn'] = 'Cancel';
 $string['categories_created'] = 'Number of categories created:';
+$string['data'] = 'Data (JSON)';
 $string['delete_logs'] = 'Purge all logs';
 $string['download_logs_title'] = 'Download logs';
 $string['download_log_range'] = 'Download logs newer than selected date';
+$string['endpoint'] = 'Endpoint';
 $string['entries_migrated'] = 'The number of entries migrated:';
 $string['insertbtn'] = 'Embed media';
 $string['invalid_url'] = 'Invalid URL';
@@ -53,14 +55,18 @@
 $string['migration_start_over_redirect'] = 'The migration statistics and last known location has been restarted.';
 $string['migration_start_time'] = 'The migration was originally started at:';
 $string['missing_required_info'] = 'Warning: the Partner id or Admin secret is empty.  The Kaltura plug-ins will not work.';
+$string['module'] = 'Module';
 $string['no_records'] = 'No records returned.';
 $string['original_kafcategory'] = 'The KAF category selected for migration.';
 $string['partner_id'] = 'Partner id';
 $string['partner_id_desc'] = 'Enter the partner id for your account.';
 $string['pluginname'] = 'Kaltura package libraries';
+$string['preview'] = 'Preview';
 $string['records_deleted'] = 'All Kaltura log records were deleted.';
+$string['request'] = 'Request/Response';
 $string['server_uri'] = 'Server URI';
 $string['server_uri_desc'] = 'Type in the server URI you want to connect to.  Otherwise just type in the default settings (This setting is used for migration purposes).';
 $string['startover'] = 'Restart migration';
+$string['time'] = 'Time';
 $string['trace_log'] = 'Enable trace logging';
 $string['trace_log_desc'] = 'If enabled, all requests and responses to and from Kaltura are logged.  These logs can be used by Kaltura support to diagnose any problems encountered.  Enabling this setting may affect Moodle performance.  You may download a CSV file of the logs from <a href="{$a}">here</a>.';
diff --git a/local/kaltura/locallib.php b/local/kaltura/locallib.php
index 862c5d41..77fecbed 100644
--- a/local/kaltura/locallib.php
+++ b/local/kaltura/locallib.php
@@ -383,6 +383,7 @@ function local_kaltura_request_lti_launch($ltirequest, $withblocks = true, $edit
 
     // Add custom parameters
     $requestparams['custom_publishdata'] = local_kaltura_get_kaf_publishing_data();
+    $requestparams['custom_publishdata_encoded'] = '1';
 
     // Specific settings for video presentation requests.
     if (isset($ltirequest['custom_disable_add_new'])) {
@@ -504,7 +505,7 @@ function local_kaltura_get_kaf_publishing_data() {
     // Return an array with no pre-defined keys to structure the JSON the way Kaltura needs it to be.
     $json->courses = array_values($json->courses);
 
-    return json_encode($json);
+    return base64_encode(json_encode($json));
 }
 
 /**
diff --git a/local/kaltura/service.php b/local/kaltura/service.php
index 2763c3d9..ae4fb92a 100644
--- a/local/kaltura/service.php
+++ b/local/kaltura/service.php
@@ -44,7 +44,7 @@
 $showtitle = optional_param('showTitle', '', PARAM_TEXT);
 $showdescription = optional_param('showDescription', '', PARAM_TEXT);
 $showtags = optional_param('showTags', '', PARAM_TEXT);
-$showdescription = optional_param('showDuration', '', PARAM_TEXT);
+$showduration = optional_param('showDuration', '', PARAM_TEXT);
 $showowner = optional_param('showOwner', '', PARAM_TEXT);
 $player = optional_param('player', '', PARAM_TEXT);
 $size = optional_param('size', '', PARAM_TEXT);
@@ -81,6 +81,7 @@
 $metadata->tags = $tags;
 $metadata->showtitle = $showtitle;
 $metadata->showdescription = $showdescription;
+$metadata->showduration = $showduration;
 $metadata->showowner = $showowner;
 $metadata->player = $player;
 $metadata->size = $size;
diff --git a/local/kaltura/version.php b/local/kaltura/version.php
index 5723c84e..2cb93a8d 100644
--- a/local/kaltura/version.php
+++ b/local/kaltura/version.php
@@ -25,8 +25,8 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015021107;
+$plugin->version = 2015090707;
 $plugin->component = 'local_kaltura';
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->release = 'Kaltura release 4.0.07';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-debug.js b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-debug.js
index 14660e70..7ba5d197 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-debug.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-debug.js
@@ -89,6 +89,22 @@ Y.extend(LTICONTAINER, Y.Base, {
      */
      ltiframe: null,
 
+    /**
+     * The width of the entry
+     * @property width
+     * @type {int}
+     * @default null
+     */
+    width: null,
+
+    /**
+     * The height of the entry
+     * @property height
+     * @type {int}
+     * @default null
+     */
+    height: null,
+
     /**
      * Init function for the checkboxselection module
      * @property params
@@ -97,6 +113,12 @@ Y.extend(LTICONTAINER, Y.Base, {
     init : function(params) {
         var bodynode = Y.one('body[class~='+params.bodyclass+']');
 
+        if(params.height && params.width)
+        {
+            this.height = params.height;
+            this.width = params.width;
+        }
+
         this.lastheight = params.lastheight;
         this.padding = params.padding;
         this.viewportheight = bodynode.get('winHeight');
@@ -136,6 +158,13 @@ Y.extend(LTICONTAINER, Y.Base, {
                 }
             }
         }
+
+        // if we have the entry's dimensions - use them to adjust the iframe size.
+        if(this.height && this.width)
+        {
+            this.ltiframe.setStyle('width', this.width+'px');
+            this.ltiframe.setStyle('height', this.height+'px');
+        }
     }
 },
 {
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-min.js b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-min.js
index fbfe81e6..6408e1f5 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-min.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer-min.js
@@ -1 +1 @@
-YUI.add("moodle-local_kaltura-lticontainer",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{lastheight:null,padding:15,viewportheight:null,documentheight:null,clientheight:null,kalvidwidth:null,ltiframe:null,init:function(t){var n=e.one("body[class~="+t.bodyclass+"]");this.lastheight=t.lastheight,this.padding=t.padding,this.viewportheight=n.get("winHeight"),this.documentheight=n.get("docHeight"),this.clientheight=n.getDOMNode.clientHeight,this.ltiframe=e.one("#contentframe"),this.kalvidwidth=t.kalvidwidth,this.resize(),this.timer=e.later(250,this,this.resize)},resize:function(){if(this.lastheight!==Math.min(this.documentheight,this.viewportheight)){var t=this.viewportheight-this.ltiframe.getY()-this.padding+"px";this.ltiframe.setStyle("height",t),this.lastheight=Math.min(this.documentheight,this.viewportheight)}var n=e.one("#kalvid_content");if(n!==null){var r=n.get("offsetWidth"),i=r-this.padding;if(this.kalvidwidth!==null){var s=this.kalvidwidth*2;s>i?this.ltiframe.setStyle("width",i+"px"):this.ltiframe.setStyle("width",s+"px")}}}},{NAME:"moodle-local_kaltura-lticontainer",ATTRS:{bodyclass:{value:null},lastheight:{value:null},padding:{value:15}}}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)}},"@VERSION@",{requires:["base","node"]});
+YUI.add("moodle-local_kaltura-lticontainer",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{lastheight:null,padding:15,viewportheight:null,documentheight:null,clientheight:null,kalvidwidth:null,ltiframe:null,width:null,height:null,init:function(t){var n=e.one("body[class~="+t.bodyclass+"]");t.height&&t.width&&(this.height=t.height,this.width=t.width),this.lastheight=t.lastheight,this.padding=t.padding,this.viewportheight=n.get("winHeight"),this.documentheight=n.get("docHeight"),this.clientheight=n.getDOMNode.clientHeight,this.ltiframe=e.one("#contentframe"),this.kalvidwidth=t.kalvidwidth,this.resize(),this.timer=e.later(250,this,this.resize)},resize:function(){if(this.lastheight!==Math.min(this.documentheight,this.viewportheight)){var t=this.viewportheight-this.ltiframe.getY()-this.padding+"px";this.ltiframe.setStyle("height",t),this.lastheight=Math.min(this.documentheight,this.viewportheight)}var n=e.one("#kalvid_content");if(n!==null){var r=n.get("offsetWidth"),i=r-this.padding;if(this.kalvidwidth!==null){var s=this.kalvidwidth*2;s>i?this.ltiframe.setStyle("width",i+"px"):this.ltiframe.setStyle("width",s+"px")}}this.height&&this.width&&(this.ltiframe.setStyle("width",this.width+"px"),this.ltiframe.setStyle("height",this.height+"px"))}},{NAME:"moodle-local_kaltura-lticontainer",ATTRS:{bodyclass:{value:null},lastheight:{value:null},padding:{value:15}}}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)}},"@VERSION@",{requires:["base","node"]});
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer.js b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer.js
index 14660e70..7ba5d197 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-lticontainer/moodle-local_kaltura-lticontainer.js
@@ -89,6 +89,22 @@ Y.extend(LTICONTAINER, Y.Base, {
      */
      ltiframe: null,
 
+    /**
+     * The width of the entry
+     * @property width
+     * @type {int}
+     * @default null
+     */
+    width: null,
+
+    /**
+     * The height of the entry
+     * @property height
+     * @type {int}
+     * @default null
+     */
+    height: null,
+
     /**
      * Init function for the checkboxselection module
      * @property params
@@ -97,6 +113,12 @@ Y.extend(LTICONTAINER, Y.Base, {
     init : function(params) {
         var bodynode = Y.one('body[class~='+params.bodyclass+']');
 
+        if(params.height && params.width)
+        {
+            this.height = params.height;
+            this.width = params.width;
+        }
+
         this.lastheight = params.lastheight;
         this.padding = params.padding;
         this.viewportheight = bodynode.get('winHeight');
@@ -136,6 +158,13 @@ Y.extend(LTICONTAINER, Y.Base, {
                 }
             }
         }
+
+        // if we have the entry's dimensions - use them to adjust the iframe size.
+        if(this.height && this.width)
+        {
+            this.ltiframe.setStyle('width', this.width+'px');
+            this.ltiframe.setStyle('height', this.height+'px');
+        }
     }
 },
 {
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-debug.js b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-debug.js
index 951d31a0..ec270a0b 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-debug.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-debug.js
@@ -288,8 +288,16 @@ Y.extend(LTIPANELMEDIAASSIGNMENT, Y.Base, {
         this.panelheight = parseInt(height, 10) + 45;
         this.panelwidth = parseInt(width, 10) + 23;
 
-        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"px' "+
-                "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+        width += 'px';
+
+        if (Y.UA.ipod !== 0 || Y.UA.ipad !== 0 || Y.UA.iphone !== 0 || Y.UA.android !== 0 || Y.UA.mobile !== null) {
+            this.panelwidth = '80%';
+            width = '100%';
+        }
+
+        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"' "+
+            "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+
 
         // If the panel has not yet been initialized.
         if (null === this.panel) {
@@ -415,7 +423,7 @@ Y.extend(LTISUBMISSIONREVIEW, Y.Base, {
         var source, height, width;
         // Test if the target is an anchor tag or img tag.
         if (e.target.test('a')) {
-            source = e.target.getAttribute('href');alert(e.target);
+            source = e.target.getAttribute('href');
             height = e.target.ancestor('div[name=media_submission]').get('childNodes').filter('input[name=height]').get('value');
             width = e.target.ancestor('div[name=media_submission]').get('childNodes').filter('input[name=width]').get('value');
         } else {
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-min.js b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-min.js
index eb0e818f..ac28db22 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-min.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel-min.js
@@ -1 +1,2 @@
-YUI.add("moodle-local_kaltura-ltipanel",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panelbodycontent:null,panelvisible:!1,panel:null,modulename:null,addvidbtnid:null,init:function(t){if("0"===t.addvidbtnid||"0"===t.ltilaunchurl||0===t.courseid||0===t.height||0===t.width){alert("Some parameters were not initialized.");return}this.modulename=t.modulename,this.addvidbtnid=t.addvidbtnid;var n=e.one("#"+t.addvidbtnid);n.on("click",this.open_panel_callback,this,t.ltilaunchurl,t.height,t.width)},open_panel_callback:function(t,n,r,i){var s=parseInt(r,10)+45,o=parseInt(i,10)+23+"px";i+="px";if(e.UA.ipod!==0||e.UA.ipad!==0||e.UA.iphone!==0||e.UA.android!==0||e.UA.mobile!==null)o="80%",i="100%";var u="<iframe id='panelcontentframe' height='"+r+"px' width='"+i+"' src='"+n+"'></iframe>";this.panelbodycontent=u;if(e.UA.ipod!==0||e.UA.ipad!==0||e.UA.iphone!==0)this.panelbodycontent="<div id='panelcontentframecontainer'>"+u+"</div>";null===this.panel?(this.panel=new e.Panel({srcNode:e.Node.create('<div id="dialog" />'),headerContent:"",bodyContent:this.panelbodycontent,width:o,height:s+"px",zIndex:6,centered:!0,modal:!0,visible:!1,render:!0,hideOn:[{node:e.one("input[id=closeltipanel]"),eventName:"click"}]}),this.panel.show(),e.one("input[id=closeltipanel]").on("click",this.lti_hide_panel_callback,this),this.panel.after("visibleChange",this.lti_panel_visible_change_callback,this)):this.panel.show()},lti_hide_panel_callback:function(){var t=e.one("img[id=video_thumbnail]");t.setStyle("display","none");var n=e.one("iframe[id=contentframe]");n.setAttribute("width",e.one("input[id=width]").getAttribute("value")),n.setAttribute("height",e.one("input[id=height]").getAttribute("value")),n.setStyle("display","inline");var r=e.one("input[name=modulename]");undefined!==r&&("kalvidres"===this.modulename||"kalvidpres"===this.modulename)&&this.lti_panel_change_add_media_button_caption()},lti_panel_change_add_media_button_caption:function(){var t=M.util.get_string("replace_video",this.modulename);t!==e.one("#"+this.addvidbtnid).getAttribute("value")&&e.one("#"+this.addvidbtnid).setAttribute("value",t)},lti_panel_visible_change_callback:function(){this.panelvisible=this.panel.get("visible"),!0===this.panelvisible?this.panel.set("bodyContent",this.panelbodycontent):this.panel.set("bodyContent","")}},{NAME:"moodle-local_kaltura-ltipanel",ATTRS:{addvidbtnid:{value:"0"},ltilaunchurl:{value:"0"},height:{value:0},width:{value:0},modulename:{value:""}}});var r=function(){r.superclass.constructor.apply(this,arguments)};e.extend(r,e.Base,{panelbodycontent:null,panelvisible:!1,panel:null,panelheight:0,panelwidth:0,init:function(t){if("0"===t.addvidbtnid||"0"===t.ltilaunchurl||0===t.courseid||0===t.height||0===t.width)return;var n=e.one("#"+t.addvidbtnid);n.on("click",this.open_panel_callback,this,t.ltilaunchurl,t.height,t.width)},open_panel_callback:function(t,n,r,i){this.panelheight=parseInt(r,10)+45,this.panelwidth=parseInt(i,10)+23,this.panelbodycontent="<iframe id='panelcontentframe' height='"+r+"px' width='"+i+"px' "+"allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+n+"'></iframe>",null===this.panel?(this.panel=new e.Panel({srcNode:e.Node.create('<div id="dialog" />'),headerContent:"",bodyContent:this.panelbodycontent,width:this.panelwidth+"px",height:this.panelheight+"px",zIndex:6,centered:!0,modal:!0,visible:!1,render:!0,hideOn:[{node:e.one("input[id=closeltipanel]"),eventName:"click"}]}),this.panel.show(),e.one("input[id=closeltipanel]").on("click",this.lti_hide_panel_callback,this),this.panel.after("visibleChange",this.lti_panel_visible_change_callback,this)):this.panel.show()},lti_hide_panel_callback:function(){e.one("input[id=submit_video]").removeAttribute("disabled");var t=e.one("img[id=video_thumbnail]");t.setStyle("display","none");var n=e.one("iframe[id=contentframe]");n.setAttribute("width",e.one("input[id=width]").getAttribute("value")),n.setAttribute("height",e.one("input[id=height]").getAttribute("value")),n.setStyle("display","inline"),e.one("#id_add_video").set("value",M.util.get_string("replacevideo","kalvidassign"))},lti_panel_visible_change_callback:function(){this.panelvisible=this.panel.get("visible"),!0===this.panelvisible?(this.panel.set("bodyContent",this.panelbodycontent),this.panel.set("height",this.panelheight),this.panel.set("width",this.panelwidth),this.panel.set("centered",!0)):this.panel.set("bodyContent","")}},{NAME:"moodle-local_kaltura-ltipanel",ATTRS:{addvidbtnid:{value:"0"},ltilaunchurl:{value:"0"},height:{value:0},width:{value:0}}});var i=function(){i.superclass.constructor.apply(this,arguments)};e.extend(i,e.Base,{ltimediaassignment:null,init:function(t){this.ltimediaassignment=t,e.one("form[id=fastgrade]").delegate("click",this.review_submission,"a[name=submission_source]",this)},review_submission:function(e){e.preventDefault();var t,n,r;e.target.test("a")?(t=e.target.getAttribute("href"),alert(e.target),n=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=height]").get("value"),r=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=width]").get("value")):(t=e.target.ancestor("a[name=submission_source]").getAttribute("href"),n=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=height]").get("value"),r=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=width]").get("value")),this.ltimediaassignment.open_panel_callback(null,t,n,r)}},{NAME:"moodle-local_kaltura-ltipanel"}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)},M.local_kaltura.initmediaassignment=function(e){return new r(e)},M.local_kaltura.initreviewsubmission=function(){var e={addvidbtnid:"0",ltilaunchurl:"0",courseid:0,height:0,width:0},t=new r(e);return new i(t)}},"@VERSION@",{requires:["base","node","panel","node-event-simulate"]});
+YUI.add("moodle-local_kaltura-ltipanel",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panelbodycontent:null,panelvisible:!1,panel:null,modulename:null,addvidbtnid:null,init:function(t){if("0"===t.addvidbtnid||"0"===t.ltilaunchurl||0===t.courseid||0===t.height||0===t.width){alert("Some parameters were not initialized.");return}this.modulename=t.modulename,this.addvidbtnid=t.addvidbtnid;var n=e.one("#"+t.addvidbtnid);n.on("click",this.open_panel_callback,this,t.ltilaunchurl,t.height,t.width)},open_panel_callback:function(t,n,r,i){var s=parseInt(r,10)+45,o=parseInt(i,10)+23+"px";i+="px";if(e.UA.ipod!==0||e.UA.ipad!==0||e.UA.iphone!==0||e.UA.android!==0||e.UA.mobile!==null)o="80%",i="100%";var u="<iframe id='panelcontentframe' height='"+r+"px' width='"+i+"' src='"+n+"'></iframe>";this.panelbodycontent=u;if(e.UA.ipod!==0||e.UA.ipad!==0||e.UA.iphone!==0)this.panelbodycontent="<div id='panelcontentframecontainer'>"+u+"</div>";null===this.panel?(this.panel=new e.Panel({srcNode:e.Node.create('<div id="dialog" />'),headerContent:"",bodyContent:this.panelbodycontent,width:o,height:s+"px",zIndex:6,centered:!0,modal:!0,visible:!1,render:!0,hideOn:[{node:e.one("input[id=closeltipanel]"),eventName:"click"}]}),this.panel.show(),e.one("input[id=closeltipanel]").on("click",this.lti_hide_panel_callback,this),this.panel.after("visibleChange",this.lti_panel_visible_change_callback,this)):this.panel.show()},lti_hide_panel_callback:function(){var t=e.one("img[id=video_thumbnail]");t.setStyle("display","none");var n=e.one("iframe[id=contentframe]");n.setAttribute("width",e.one("input[id=width]").getAttribute("value")),n.setAttribute("height",e.one("input[id=height]").getAttribute("value")),n.setStyle("display","inline");var r=e.one("input[name=modulename]");undefined!==r&&("kalvidres"===this.modulename||"kalvidpres"===this.modulename)&&this.lti_panel_change_add_media_button_caption()},lti_panel_change_add_media_button_caption:function(){var t=M.util.get_string("replace_video",this.modulename);t!==e.one("#"+this.addvidbtnid).getAttribute("value")&&e.one("#"+this.addvidbtnid).setAttribute("value",t)},lti_panel_visible_change_callback:function(){this.panelvisible=this.panel.get("visible"),!0===this.panelvisible?this.panel.set("bodyContent",this.panelbodycontent):this.panel.set("bodyContent","")}},{NAME:"moodle-local_kaltura-ltipanel",ATTRS:{addvidbtnid:{value:"0"},ltilaunchurl:{value:"0"},height:{value:0},width:{value:0},modulename:{value:""}}});var r=function(){r.superclass.constructor.apply(this,arguments)};e.extend(r,e.Base,{panelbodycontent:null,panelvisible:!1,panel:null,panelheight:0,panelwidth:0,init:function(t){if("0"===t.addvidbtnid||"0"===t.ltilaunchurl||0===t.courseid||0===t.height||0===t.width)return;var n=e.one("#"+t.addvidbtnid);n.on("click",this.open_panel_callback,this,t.ltilaunchurl,t.height,t.width)},open_panel_callback:function(t,n,r,i){this.panelheight=parseInt(r,10)+45,this.panelwidth=parseInt(i,10)+23,i+="px";if(e.UA.ipod!==0||e.UA.ipad!==0||e.UA.iphone!==0||e.UA.android!==0||e.UA.mobile!==null)this.panelwidth="80%",i="100%";this.panelbodycontent="<iframe id='panelcontentframe' height='"+r+"px' width='"+i+"' "+"allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+n+"'></iframe>",null===this.panel?(this.panel=new e.Panel({srcNode:e.Node.create('<div id="dialog" />'),headerContent:"",bodyContent:this.panelbodycontent,width:this.panelwidth+"px",height:this.panelheight+"px",zIndex:6,centered:!0,modal:!0,visible:!1,render:!0,hideOn:[{node:e.one("input[id=closeltipanel]"),eventName:"click"}]}),this.panel.show(),e.one("input[id=closeltipanel]").on("click",this.lti_hide_panel_callback,this),this.panel.after("visibleChange",this.lti_panel_visible_change_callback,this)):this.panel.show()},lti_hide_panel_callback:function(){e.one("input[id=submit_video]").removeAttribute("disabled");var t=e.one("img[id=video_thumbnail]");t.setStyle("display","none");var n=e.one("iframe[id=contentframe]");n.setAttribute("width",e.one("input[id=width]").getAttribute("value")),n.setAttribute("height",e.one("input[id=height]").getAttribute("value")),n.setStyle("display","inline"),e.one("#id_add_video").set("value",M.util.get_string("replacevideo","kalvidassign"))},lti_panel_visible_change_callback:function(){this.panelvisible=this.panel.get("visible"),!0===this.panelvisible?(this.panel.set("bodyContent",this.panelbodycontent),this.panel.set("height",this.panelheight),this.panel.set("width",this.panelwidth),this.panel.set("centered",!0)):this.panel.set("bodyContent","")}},{NAME:"moodle-local_kaltura-ltipanel",ATTRS:{addvidbtnid:{value:"0"},ltilaunchurl:{value:"0"},height:{value:0},width:{value:0}}});var i=function(){i.superclass.constructor.apply(this,arguments)};e.extend(i,e.Base,{ltimediaassignment:null,init:function(t){this.ltimediaassignment=t,e.one("form[id=fastgrade]").delegate("click",this.review_submission,"a[name=submission_source]",this)},review_submission:function(e){e.preventDefault();var t,n,r;e.target.test("a")?(t=e.target.getAttribute("href"),n=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=height]").get("value"),r=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=width]").get("value")):(t=e.target.ancestor("a[name=submission_source]").getAttribute("href"),n=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=height]").get("value"),r=e.target.ancestor("div[name=media_submission]").get("childNodes").filter("input[name=width]").get("value")),this.ltimediaassignment.open_panel_callback(null,t,n,r)}},{NAME:"moodle-local_kaltura-ltipanel"}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)},M.local_kaltura.initmediaassignment=function(e){return new r(e)},M.local_kaltura.initreviewsubmission=function(){var e={addvidbtnid:"0",ltilaunchurl:"0",courseid:0,height:0,width:0},t=new r(e);return new i(t)
+}},"@VERSION@",{requires:["base","node","panel","node-event-simulate"]});
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel.js b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel.js
index 951d31a0..ec270a0b 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltipanel/moodle-local_kaltura-ltipanel.js
@@ -288,8 +288,16 @@ Y.extend(LTIPANELMEDIAASSIGNMENT, Y.Base, {
         this.panelheight = parseInt(height, 10) + 45;
         this.panelwidth = parseInt(width, 10) + 23;
 
-        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"px' "+
-                "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+        width += 'px';
+
+        if (Y.UA.ipod !== 0 || Y.UA.ipad !== 0 || Y.UA.iphone !== 0 || Y.UA.android !== 0 || Y.UA.mobile !== null) {
+            this.panelwidth = '80%';
+            width = '100%';
+        }
+
+        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"' "+
+            "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+
 
         // If the panel has not yet been initialized.
         if (null === this.panel) {
@@ -415,7 +423,7 @@ Y.extend(LTISUBMISSIONREVIEW, Y.Base, {
         var source, height, width;
         // Test if the target is an anchor tag or img tag.
         if (e.target.test('a')) {
-            source = e.target.getAttribute('href');alert(e.target);
+            source = e.target.getAttribute('href');
             height = e.target.ancestor('div[name=media_submission]').get('childNodes').filter('input[name=height]').get('value');
             width = e.target.ancestor('div[name=media_submission]').get('childNodes').filter('input[name=width]').get('value');
         } else {
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-debug.js b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-debug.js
index deb9ff66..398ae81b 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-debug.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-debug.js
@@ -67,6 +67,8 @@ Y.extend(LTISERVICE, Y.Base, {
             Y.one(window.parent.document.getElementById('video_preview_frame')).setAttribute('src', decodeURIComponent(params.iframeurl));
         } else if (window.parent.document.getElementById('contentframe')) {
             Y.one(window.parent.document.getElementById('contentframe')).setAttribute('src', decodeURIComponent(params.iframeurl));
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('width', params.width + 'px');
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('height', params.height + 'px');
         }
 
         // This element must exist.
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-min.js b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-min.js
index f27d2920..073d183f 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-min.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice-min.js
@@ -1 +1 @@
-YUI.add("moodle-local_kaltura-ltiservice",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{init:function(t){window.parent.document.getElementById("video_title")&&e.one(window.parent.document.getElementById("video_title")).setAttribute("value",t.title),window.parent.document.getElementById("entry_id")&&e.one(window.parent.document.getElementById("entry_id")).setAttribute("value",t.entryid),window.parent.document.getElementById("height")&&e.one(window.parent.document.getElementById("height")).setAttribute("value",t.height),window.parent.document.getElementById("width")&&e.one(window.parent.document.getElementById("width")).setAttribute("value",t.width),window.parent.document.getElementById("uiconf_id")&&e.one(window.parent.document.getElementById("uiconf_id")).setAttribute("value","1"),window.parent.document.getElementById("widescreen")&&e.one(window.parent.document.getElementById("widescreen")).setAttribute("value","1"),window.parent.document.getElementById("video_preview_frame")?e.one(window.parent.document.getElementById("video_preview_frame")).setAttribute("src",decodeURIComponent(t.iframeurl)):window.parent.document.getElementById("contentframe")&&e.one(window.parent.document.getElementById("contentframe")).setAttribute("src",decodeURIComponent(t.iframeurl)),e.one(window.parent.document.getElementById("source")).setAttribute("value",decodeURIComponent(t.iframeurl)),window.parent.document.getElementById("metadata")&&e.one(window.parent.document.getElementById("metadata")).setAttribute("value",t.metadata),window.parent.document.getElementById("closeltipanel")&&e.one(window.parent.document.getElementById("closeltipanel")).simulate("click")}},{NAME:"moodle-local_kaltura-ltiservice",ATTRS:{iframeurl:{value:""},width:{value:""},height:{value:""},entryid:{value:""},title:{value:""},metadata:{value:""}}}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)}},"@VERSION@",{requires:["base","node","node-event-simulate"]});
+YUI.add("moodle-local_kaltura-ltiservice",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{init:function(t){window.parent.document.getElementById("video_title")&&e.one(window.parent.document.getElementById("video_title")).setAttribute("value",t.title),window.parent.document.getElementById("entry_id")&&e.one(window.parent.document.getElementById("entry_id")).setAttribute("value",t.entryid),window.parent.document.getElementById("height")&&e.one(window.parent.document.getElementById("height")).setAttribute("value",t.height),window.parent.document.getElementById("width")&&e.one(window.parent.document.getElementById("width")).setAttribute("value",t.width),window.parent.document.getElementById("uiconf_id")&&e.one(window.parent.document.getElementById("uiconf_id")).setAttribute("value","1"),window.parent.document.getElementById("widescreen")&&e.one(window.parent.document.getElementById("widescreen")).setAttribute("value","1"),window.parent.document.getElementById("video_preview_frame")?e.one(window.parent.document.getElementById("video_preview_frame")).setAttribute("src",decodeURIComponent(t.iframeurl)):window.parent.document.getElementById("contentframe")&&(e.one(window.parent.document.getElementById("contentframe")).setAttribute("src",decodeURIComponent(t.iframeurl)),e.one(window.parent.document.getElementById("contentframe")).setStyle("width",t.width+"px"),e.one(window.parent.document.getElementById("contentframe")).setStyle("height",t.height+"px")),e.one(window.parent.document.getElementById("source")).setAttribute("value",decodeURIComponent(t.iframeurl)),window.parent.document.getElementById("metadata")&&e.one(window.parent.document.getElementById("metadata")).setAttribute("value",t.metadata),window.parent.document.getElementById("closeltipanel")&&e.one(window.parent.document.getElementById("closeltipanel")).simulate("click")}},{NAME:"moodle-local_kaltura-ltiservice",ATTRS:{iframeurl:{value:""},width:{value:""},height:{value:""},entryid:{value:""},title:{value:""},metadata:{value:""}}}),M.local_kaltura=M.local_kaltura||{},M.local_kaltura.init=function(e){return new n(e)}},"@VERSION@",{requires:["base","node","node-event-simulate"]});
diff --git a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice.js b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice.js
index deb9ff66..398ae81b 100644
--- a/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice.js
+++ b/local/kaltura/yui/build/moodle-local_kaltura-ltiservice/moodle-local_kaltura-ltiservice.js
@@ -67,6 +67,8 @@ Y.extend(LTISERVICE, Y.Base, {
             Y.one(window.parent.document.getElementById('video_preview_frame')).setAttribute('src', decodeURIComponent(params.iframeurl));
         } else if (window.parent.document.getElementById('contentframe')) {
             Y.one(window.parent.document.getElementById('contentframe')).setAttribute('src', decodeURIComponent(params.iframeurl));
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('width', params.width + 'px');
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('height', params.height + 'px');
         }
 
         // This element must exist.
diff --git a/local/kaltura/yui/src/lticontainer/js/lticontainer.js b/local/kaltura/yui/src/lticontainer/js/lticontainer.js
index bd1df15a..67bd67be 100644
--- a/local/kaltura/yui/src/lticontainer/js/lticontainer.js
+++ b/local/kaltura/yui/src/lticontainer/js/lticontainer.js
@@ -87,6 +87,22 @@ Y.extend(LTICONTAINER, Y.Base, {
      */
      ltiframe: null,
 
+    /**
+     * The width of the entry
+     * @property width
+     * @type {int}
+     * @default null
+     */
+    width: null,
+
+    /**
+     * The height of the entry
+     * @property height
+     * @type {int}
+     * @default null
+     */
+    height: null,
+
     /**
      * Init function for the checkboxselection module
      * @property params
@@ -95,6 +111,12 @@ Y.extend(LTICONTAINER, Y.Base, {
     init : function(params) {
         var bodynode = Y.one('body[class~='+params.bodyclass+']');
 
+        if(params.height && params.width)
+        {
+            this.height = params.height;
+            this.width = params.width;
+        }
+
         this.lastheight = params.lastheight;
         this.padding = params.padding;
         this.viewportheight = bodynode.get('winHeight');
@@ -134,6 +156,13 @@ Y.extend(LTICONTAINER, Y.Base, {
                 }
             }
         }
+
+        // if we have the entry's dimensions - use them to adjust the iframe size.
+        if(this.height && this.width)
+        {
+            this.ltiframe.setStyle('width', this.width+'px');
+            this.ltiframe.setStyle('height', this.height+'px');
+        }
     }
 },
 {
diff --git a/local/kaltura/yui/src/ltipanel/js/ltipanel.js b/local/kaltura/yui/src/ltipanel/js/ltipanel.js
index 2b6e75c1..bc45b445 100644
--- a/local/kaltura/yui/src/ltipanel/js/ltipanel.js
+++ b/local/kaltura/yui/src/ltipanel/js/ltipanel.js
@@ -286,8 +286,16 @@ Y.extend(LTIPANELMEDIAASSIGNMENT, Y.Base, {
         this.panelheight = parseInt(height, 10) + 45;
         this.panelwidth = parseInt(width, 10) + 23;
 
-        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"px' "+
-                "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+        width += 'px';
+
+        if (Y.UA.ipod !== 0 || Y.UA.ipad !== 0 || Y.UA.iphone !== 0 || Y.UA.android !== 0 || Y.UA.mobile !== null) {
+            this.panelwidth = '80%';
+            width = '100%';
+        }
+
+        this.panelbodycontent = "<iframe id='panelcontentframe' height='"+height+"px' width='"+width+"' "+
+            "allowfullscreen='true' webkitallowfullscreen='true' mozallowfullscreen='true' src='"+url+"'></iframe>";
+
 
         // If the panel has not yet been initialized.
         if (null === this.panel) {
diff --git a/local/kaltura/yui/src/ltiservice/js/ltiservice.js b/local/kaltura/yui/src/ltiservice/js/ltiservice.js
index 5f017e53..165c4d55 100644
--- a/local/kaltura/yui/src/ltiservice/js/ltiservice.js
+++ b/local/kaltura/yui/src/ltiservice/js/ltiservice.js
@@ -65,6 +65,8 @@ Y.extend(LTISERVICE, Y.Base, {
             Y.one(window.parent.document.getElementById('video_preview_frame')).setAttribute('src', decodeURIComponent(params.iframeurl));
         } else if (window.parent.document.getElementById('contentframe')) {
             Y.one(window.parent.document.getElementById('contentframe')).setAttribute('src', decodeURIComponent(params.iframeurl));
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('width', params.width + 'px');
+            Y.one(window.parent.document.getElementById('contentframe')).setStyle('height', params.height + 'px');
         }
 
         // This element must exist.
diff --git a/local/kalturamediagallery/version.php b/local/kalturamediagallery/version.php
index e7457223..354346a9 100644
--- a/local/kalturamediagallery/version.php
+++ b/local/kalturamediagallery/version.php
@@ -26,11 +26,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015021107;
+$plugin->version = 2015090707;
 $plugin->component = 'local_kalturamediagallery';
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->release = 'Kaltura release 4.0.07';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/local/mymedia/version.php b/local/mymedia/version.php
index d9ddbad7..571cc631 100644
--- a/local/mymedia/version.php
+++ b/local/mymedia/version.php
@@ -25,11 +25,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2015021107;
+$plugin->version = 2015090707;
 $plugin->component = 'local_mymedia';
-$plugin->release = 'Kaltura release 4.0.04';
+$plugin->release = 'Kaltura release 4.0.07';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/mod/kalvidassign/classes/event/assignment_details_viewed.php b/mod/kalvidassign/classes/event/assignment_details_viewed.php
new file mode 100644
index 00000000..b8a10dfe
--- /dev/null
+++ b/mod/kalvidassign/classes/event/assignment_details_viewed.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The assignment_details_viewed event.
+ *
+ * @package    mod
+ * @subpackage kalvidassign
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidassign\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The assignment_details_viewed event class.
+ * 
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class assignment_details_viewed extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'r'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
+        $this->data['objecttable'] = 'kalvidassign';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventassignment_details_viewed', 'kalvidassign');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' viewed the details"
+        . " of the Kaltura media assignment with the course module id of '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('view.php', array('cmid' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidassign', 'view assignment details',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidassign/classes/event/assignment_submitted.php b/mod/kalvidassign/classes/event/assignment_submitted.php
new file mode 100644
index 00000000..69c08c0f
--- /dev/null
+++ b/mod/kalvidassign/classes/event/assignment_submitted.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The assignment_submitted event.
+ *
+ * @package    mod
+ * @subpackage kalvidassign
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidassign\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The assignment_submitted event class.
+ * 
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class assignment_submitted extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'u'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
+        $this->data['objecttable'] = 'kalvidassign_submission';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventassignment_submitted', 'kalvidassign');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' made a submission to the Kaltura media"
+        . " assignment with the course module id of '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('view.php', array('cmid' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidassign', 'submit',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidassign/classes/event/grade_submissions_page_viewed.php b/mod/kalvidassign/classes/event/grade_submissions_page_viewed.php
new file mode 100644
index 00000000..9c787437
--- /dev/null
+++ b/mod/kalvidassign/classes/event/grade_submissions_page_viewed.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The grade_submissions_page_viewed event.
+ *
+ * @package    mod
+ * @subpackage kalvidassign
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidassign\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The grade_submissions_page_viewed event class.
+ * 
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class grade_submissions_page_viewed extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'r'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_TEACHING;
+        $this->data['objecttable'] = 'kalvidassign';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventgrade_submissions_page_viewed', 'kalvidassign');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' viewed the grade submissions page for "
+        . "the Kaltura media assignment with the course module id '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('grade_submissions.php', array('cmid' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidassign', 'view submissions page',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidassign/classes/event/grades_updated.php b/mod/kalvidassign/classes/event/grades_updated.php
new file mode 100644
index 00000000..2b633b0a
--- /dev/null
+++ b/mod/kalvidassign/classes/event/grades_updated.php
@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The grades_updated event.
+ *
+ * @package    mod
+ * @subpackage kalvidassign
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidassign\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The grades_updated event class.
+ * 
+ * @property-read array $other {
+ *      'crud'  => string 'c', 'r', 'u', or 'd', depending on context the event is triggered in
+ * }
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class grades_updated extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'u'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_TEACHING;
+    }
+ 
+    public static function get_name() {
+        return get_string('eventgrades_updated', 'kalvidassign');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' updated the grades"
+        . " for the Kaltura media assignment with the course module id of '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('grade_submissions.php', array('cmid' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidassign', 'update grades',
+            $this->get_url(), $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidassign/classes/event/single_submission_page_viewed.php b/mod/kalvidassign/classes/event/single_submission_page_viewed.php
new file mode 100644
index 00000000..70596f75
--- /dev/null
+++ b/mod/kalvidassign/classes/event/single_submission_page_viewed.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The single_submission_page_viewed event.
+ *
+ * @package    mod
+ * @subpackage kalvidassign
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidassign\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The single_submission_page_viewed event class.
+ * 
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class single_submission_page_viewed extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'r'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_TEACHING;
+        $this->data['objecttable'] = 'kalvidassign_submission';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventsingle_submission_page_viewed', 'kalvidassign');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' viewed the submission with id '{$this->objectid}'"
+        . " for the Kaltura media assignment with the course module id of '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('single_submission.php', array('cmid' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidassign', 'view submission page',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidassign/grade_submissions.php b/mod/kalvidassign/grade_submissions.php
index 1026bea5..69bfcdb6 100644
--- a/mod/kalvidassign/grade_submissions.php
+++ b/mod/kalvidassign/grade_submissions.php
@@ -61,7 +61,11 @@
 
 require_capability('mod/kalvidassign:gradesubmission', context_module::instance($cm->id));
 
-add_to_log($course->id, 'kalvidassign', 'view submissions page', 'grade_submissions.php?cmid='.$cm->id, $kalvidassignobj->id, $cm->id);
+$event = \mod_kalvidassign\event\grade_submissions_page_viewed::create(array(
+    'objectid'  => $kalvidassignobj->id,
+    'context'   => context_module::instance($cm->id)
+));
+$event->trigger();
 
 $prefform =  new kalvidassign_gradepreferences_form(null, array('cmid' => $cm->id, 'groupmode' => $cm->groupmode));
 $data = null;
@@ -144,8 +148,13 @@
                 kalvidassign_grade_item_update($kalvidassignobj, $grade);
 
                 // Add to log only if updating.
-                add_to_log($kalvidassignobj->course, 'kalvidassign', 'update grades', 'grade_submissions.php?cmid='.$cm->id, $cm->id);
-
+                $event = \mod_kalvidassign\event\grades_updated::create(array(
+                            'context'   => context_module::instance($cm->id),
+                            'other'     => array(
+                                'crud'    => 'u'
+                            )
+                ));
+                $event->trigger();
             }
 
         } else {
@@ -188,8 +197,13 @@
                 kalvidassign_grade_item_update($kalvidassignobj, $grade);
 
                 // Add to log only if updating
-                add_to_log($kalvidassignobj->course, 'kalvidassign', 'update grades', 'grade_submissions.php?cmid='.$cm->id, $cm->id);
-
+                $event = \mod_kalvidassign\event\grades_updated::create(array(
+                            'context'   => context_module::instance($cm->id),
+                            'other'     => array(
+                                'crud'      => 'c'
+                            )
+                ));
+                $event->trigger();
             }
 
         }
diff --git a/mod/kalvidassign/lang/en/kalvidassign.php b/mod/kalvidassign/lang/en/kalvidassign.php
index fd816785..b15ce488 100644
--- a/mod/kalvidassign/lang/en/kalvidassign.php
+++ b/mod/kalvidassign/lang/en/kalvidassign.php
@@ -114,4 +114,9 @@
 $string['failedtoinsertsubmission'] = 'Failed to insert submission record.';
 $string['video_thumbnail'] = 'Video thumbnail';
 $string['feedbackfromteacher'] = 'Feedback From Teacher';
-$string['currentgrade'] = 'Current grade in gradebook';
\ No newline at end of file
+$string['currentgrade'] = 'Current grade in gradebook';
+$string['eventgrade_submissions_page_viewed'] = 'Grade submissions page viewed';
+$string['eventsingle_submission_page_viewed'] = 'Single submission page viewed';
+$string['eventgrades_updated'] = 'Assignment grades updated';
+$string['eventassignment_submitted'] = 'Assignment submitted';
+$string['eventassignment_details_viewed'] = 'Assignment details viewed';
diff --git a/mod/kalvidassign/single_submission.php b/mod/kalvidassign/single_submission.php
index 8d23288c..b2929b0d 100644
--- a/mod/kalvidassign/single_submission.php
+++ b/mod/kalvidassign/single_submission.php
@@ -61,7 +61,11 @@
 
 require_capability('mod/kalvidassign:gradesubmission', $context);
 
-add_to_log($course->id, 'kalvidassign', 'view submission page', 'single_submission.php?id='.$cm->id, $kalvidassignobj->id, $cm->id);
+$event = \mod_kalvidassign\event\single_submission_page_viewed::create(array(
+    'objectid'  => $kalvidassignobj->id,
+    'context' => context_module::instance($cm->id)
+));
+$event->trigger();
 
 // Get a single submission record
 $submission = kalvidassign_get_submission($cm->instance, $userid);
@@ -177,8 +181,10 @@
             kalvidassign_grade_item_update($kalvidassignobj, $gradeobj);
 
             // Add to log.
-            add_to_log($kalvidassignobj->course, 'kalvidassign', 'update grades', 'grade_submissions.php?cmid='.$cm->id, $cm->id);
-
+            $event = \mod_kalvidassign\event\grades_updated::create(array(
+                        'context'   => context_module::instance($cm->id),
+            ));
+            $event->trigger();
         }
 
         // Handle outcome data
diff --git a/mod/kalvidassign/single_submission_form.php b/mod/kalvidassign/single_submission_form.php
index 4b4a0260..5fed3ccf 100644
--- a/mod/kalvidassign/single_submission_form.php
+++ b/mod/kalvidassign/single_submission_form.php
@@ -219,8 +219,6 @@ private function _generateLtiLaunchLink($source, $data)
             $width = $data->width;
             $height = $data->height;
         }
-        $realSource = local_kaltura_add_kaf_uri_token($source);
-        $hashedSource = base64_encode($realSource);
         
         $target = new moodle_url('/mod/kalvidassign/lti_launch_grade.php?cmid='.$cmid.'&source='.urlencode($source).'&height='.$height.'&width='.$width.'&courseid='.$courseId);
         return $target;
diff --git a/mod/kalvidassign/submission.php b/mod/kalvidassign/submission.php
index 6166272c..624c4722 100644
--- a/mod/kalvidassign/submission.php
+++ b/mod/kalvidassign/submission.php
@@ -101,7 +101,11 @@
         echo $OUTPUT->single_button($url, $continue, 'post');
         echo html_writer::end_tag('center');
 
-        add_to_log($course->id, 'kalvidassign', 'submit', 'view.php?id='.$cm->id, $kalvidassignobj->id, $cm->id);
+        $event = \mod_kalvidassign\event\assignment_submitted::create(array(
+                    'objectid'  => $kalvidassignobj->id,
+                    'context'   => context_module::instance($cm->id)
+        ));
+        $event->trigger();
     } else {
         notice(get_string('failedtoinsertsubmission', 'kalvidassign'), $url, $course);
     }
@@ -131,6 +135,11 @@
         echo $OUTPUT->single_button($url, $continue, 'post');
         echo html_writer::end_tag('center');
 
+        $event = \mod_kalvidassign\event\assignment_submitted::create(array(
+                    'objectid'  => $kalvidassignobj->id,
+                    'context'   => context_module::instance($cm->id)
+        ));
+        $event->trigger();
     } else {
         notice(get_string('failedtoinsertsubmission', 'kalvidassign'), $url, $course);
     }
diff --git a/mod/kalvidassign/version.php b/mod/kalvidassign/version.php
index 64d2a517..36dd1f86 100644
--- a/mod/kalvidassign/version.php
+++ b/mod/kalvidassign/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015021107;
+$module->version = 2015090707;
 $module->component  = 'mod_kalvidassign';
-$module->release    = 'Kaltura release 4.0.04';
+$module->release    = 'Kaltura release 4.0.07';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015021107,
+    'local_kaltura' => 2015090707,
 );
diff --git a/mod/kalvidassign/view.php b/mod/kalvidassign/view.php
index 6823bfa5..0cedf27f 100644
--- a/mod/kalvidassign/view.php
+++ b/mod/kalvidassign/view.php
@@ -48,7 +48,11 @@
 
 $context = context_module::instance($cm->id);
 
-add_to_log($course->id, 'kalvidassign', 'view assignment details', 'view.php?id='.$cm->id, $kalvidassign->id, $cm->id);
+$event = \mod_kalvidassign\event\assignment_details_viewed::create(array(
+            'objectid' => $kalvidassign->id,
+            'context' => context_module::instance($cm->id)
+        ));
+$event->trigger();
 
 // Update 'viewed' state if required by completion system
 $completion = new completion_info($course);
@@ -127,7 +131,9 @@
     $params = array(
         'bodyclass' => $pageclass,
         'lastheight' => null,
-        'padding' => 15
+        'padding' => 15,
+        'width' => isset($kalvidassign->width) ? $kalvidassign->width : null,
+        'height' => isset($kalvidassign->height) ? $kalvidassign->height : null
     );
     $PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);
     $PAGE->requires->string_for_js('replacevideo', 'kalvidassign');
diff --git a/mod/kalvidpres/classes/event/video_resource_viewed.php b/mod/kalvidpres/classes/event/video_resource_viewed.php
new file mode 100644
index 00000000..cd3b8f5d
--- /dev/null
+++ b/mod/kalvidpres/classes/event/video_resource_viewed.php
@@ -0,0 +1,58 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The video_resource_viewed event.
+ *
+ * @package    mod
+ * @subpackage kalvidpres
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidpres\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The video_resource_viewed event class.
+ * 
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class video_resource_viewed extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'r'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
+        $this->data['objecttable'] = 'kalvidpres';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventvideo_resource_viewed', 'kalvidpres');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' viewed the Kaltura video presentation with "
+        . "the course module id '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('view.php', array('id' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidpres', 'view video resource',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidpres/lang/en/kalvidpres.php b/mod/kalvidpres/lang/en/kalvidpres.php
index da00347e..70571cd9 100644
--- a/mod/kalvidpres/lang/en/kalvidpres.php
+++ b/mod/kalvidpres/lang/en/kalvidpres.php
@@ -34,3 +34,4 @@
 $string['invalid_source_parameter'] = 'Invalid source parameter';
 $string['replace_video'] = 'Replace media';
 $string['kalvidpres:addinstance'] = 'Add a Kaltura Video Presentation';
+$string['eventvideo_resource_viewed'] = 'Video resource viewed';
diff --git a/mod/kalvidpres/lib.php b/mod/kalvidpres/lib.php
index 02a16f00..53b560d7 100644
--- a/mod/kalvidpres/lib.php
+++ b/mod/kalvidpres/lib.php
@@ -152,7 +152,7 @@ function kalvidpres_cron () {
  * of his role (student, teacher, admin...). The returned objects must contain
  * at least id property. See other modules as example.
  *
- * @param int $kalvidpres ID of an instance of this module
+ * @param int $kalvidpresid ID of an instance of this module
  * @return boolean|array false if no participants, array of objects otherwise
  */
 function kalvidpres_get_participants($kalvidpresid) {
@@ -167,33 +167,23 @@ function kalvidpres_supports($feature) {
     switch($feature) {
         case FEATURE_MOD_ARCHETYPE:
             return MOD_ARCHETYPE_RESOURCE;
-            break;
         case FEATURE_GROUPS:
             return true;
-            break;
         case FEATURE_GROUPINGS:
             return true;
-            break;
         case FEATURE_GROUPMEMBERSONLY:
             return true;
-            break;
         case FEATURE_MOD_INTRO:
             return true;
-            break;
         case FEATURE_COMPLETION_TRACKS_VIEWS:
             return false;
-            break;
         case FEATURE_GRADE_HAS_GRADE:
             return false;
-            break;
         case FEATURE_GRADE_OUTCOMES:
             return false;
-            break;
         case FEATURE_BACKUP_MOODLE2:
             return true;
-            break;
         default:
             return null;
-            break;
     }
 }
diff --git a/mod/kalvidpres/version.php b/mod/kalvidpres/version.php
index d4fe5f2b..5bea658a 100644
--- a/mod/kalvidpres/version.php
+++ b/mod/kalvidpres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015021107;
+$module->version = 2015090707;
 $module->component  = 'mod_kalvidpres';
-$module->release    = 'Kaltura release 4.0.04';
+$module->release    = 'Kaltura release 4.0.07';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/mod/kalvidpres/view.php b/mod/kalvidpres/view.php
index e8497e1c..1a04f765 100644
--- a/mod/kalvidpres/view.php
+++ b/mod/kalvidpres/view.php
@@ -57,7 +57,11 @@
 
 $context = $PAGE->context;
 
-add_to_log($course->id, 'kalvidpres', 'view video resource', 'view.php?id='.$cm->id, $kalvidpres->id, $cm->id);
+$event = \mod_kalvidpres\event\video_resource_viewed::create(array(
+    'objectid' => $kalvidpres->id,
+    'context' => context_module::instance($cm->id)
+));
+$event->trigger();
 
 $completion = new completion_info($course);
 $completion->set_module_viewed($cm);
@@ -77,7 +81,9 @@
     'bodyclass' => $pageclass,
     'lastheight' => null,
     'padding' => 15,
-    'kalvidwidth' => $kalvidpres->width
+    'kalvidwidth' => $kalvidpres->width,
+    'width' => $kalvidpres->width,
+    'height' => $kalvidpres->height,
 );
 $PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);
 
diff --git a/mod/kalvidres/classes/event/video_resource_viewed.php b/mod/kalvidres/classes/event/video_resource_viewed.php
new file mode 100644
index 00000000..89a842fa
--- /dev/null
+++ b/mod/kalvidres/classes/event/video_resource_viewed.php
@@ -0,0 +1,58 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+ 
+/**
+ * The video_resource_viewed event.
+ *
+ * @package    mod
+ * @subpackage kalvidres
+ * @copyright  2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace mod_kalvidres\event;
+defined('MOODLE_INTERNAL') || die();
+/**
+ * The video_resource_viewed event class.
+ *
+ * @since     Moodle 2.7
+ * @copyright 2015 Rex Lorenzo <rexlorenzo@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ **/
+class video_resource_viewed extends \core\event\base {
+    protected function init() {
+        $this->data['crud'] = 'r'; // c(reate), r(ead), u(pdate), d(elete)
+        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
+        $this->data['objecttable'] = 'kalvidres';
+    }
+ 
+    public static function get_name() {
+        return get_string('eventvideo_resource_viewed', 'kalvidres');
+    }
+ 
+    public function get_description() {
+        return "The user with id '{$this->userid}' viewed the Kaltura video resource with "
+        . "the course module id '{$this->contextinstanceid}'.";
+    }
+ 
+    public function get_url() {
+        return new \moodle_url('view.php', array('id' => $this->contextinstanceid));
+    }
+ 
+    public function get_legacy_logdata() {
+        return array($this->courseid, 'kalvidres', 'view video resource',
+            $this->get_url(), $this->objectid, $this->contextinstanceid);
+    }
+}
\ No newline at end of file
diff --git a/mod/kalvidres/lang/en/kalvidres.php b/mod/kalvidres/lang/en/kalvidres.php
index 8fcff45e..d4bfc057 100644
--- a/mod/kalvidres/lang/en/kalvidres.php
+++ b/mod/kalvidres/lang/en/kalvidres.php
@@ -34,3 +34,4 @@
 $string['invalid_source_parameter'] = 'Invalid source parameter';
 $string['replace_video'] = 'Replace media';
 $string['kalvidres:addinstance'] = 'Add a Kaltura Video Resource';
+$string['eventvideo_resource_viewed'] = 'Video resource viewed';
diff --git a/mod/kalvidres/lib.php b/mod/kalvidres/lib.php
index 62b1f782..ebde499e 100644
--- a/mod/kalvidres/lib.php
+++ b/mod/kalvidres/lib.php
@@ -151,7 +151,7 @@ function kalvidres_cron () {
  * of his role (student, teacher, admin...). The returned objects must contain
  * at least id property. See other modules as example.
  *
- * @param int $kalvidres ID of an instance of this module
+ * @param int $kalvidresid ID of an instance of this module
  * @return boolean|array false if no participants, array of objects otherwise
  */
 function kalvidres_get_participants($kalvidresid) {
@@ -167,33 +167,23 @@ function kalvidres_supports($feature) {
     switch($feature) {
         case FEATURE_MOD_ARCHETYPE:
             return MOD_ARCHETYPE_RESOURCE;
-            break;
         case FEATURE_GROUPS:
             return true;
-            break;
         case FEATURE_GROUPINGS:
             return true;
-            break;
         case FEATURE_GROUPMEMBERSONLY:
             return true;
-            break;
         case FEATURE_MOD_INTRO:
             return true;
-            break;
         case FEATURE_COMPLETION_TRACKS_VIEWS:
             return false;
-            break;
         case FEATURE_GRADE_HAS_GRADE:
             return false;
-            break;
         case FEATURE_GRADE_OUTCOMES:
             return false;
-            break;
         case FEATURE_BACKUP_MOODLE2:
             return true;
-            break;
         default:
             return null;
-            break;
     }
 }
diff --git a/mod/kalvidres/version.php b/mod/kalvidres/version.php
index 0741201c..393aa94b 100644
--- a/mod/kalvidres/version.php
+++ b/mod/kalvidres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$module->version = 2015021107;
+$module->version = 2015090707;
 $module->component  = 'mod_kalvidres';
-$module->release    = 'Kaltura release 4.0.04';
+$module->release    = 'Kaltura release 4.0.07';
 $module->requires = 2014050800;
 $module->cron       = 0;
 $module->maturity = MATURITY_STABLE;
 $module->dependencies = array(
-    'local_kaltura' => 2015021107
+    'local_kaltura' => 2015090707
 );
diff --git a/mod/kalvidres/view.php b/mod/kalvidres/view.php
index bb09dfb8..59fbd31a 100644
--- a/mod/kalvidres/view.php
+++ b/mod/kalvidres/view.php
@@ -57,7 +57,11 @@
 
 $context = $PAGE->context;
 
-add_to_log($course->id, 'kalvidres', 'view video resource', 'view.php?id='.$cm->id, $kalvidres->id, $cm->id);
+$event = \mod_kalvidres\event\video_resource_viewed::create(array(
+    'objectid' => $kalvidres->id,
+    'context' => context_module::instance($cm->id)
+));
+$event->trigger();
 
 $completion = new completion_info($course);
 $completion->set_module_viewed($cm);
@@ -77,7 +81,9 @@
 $params = array(
     'bodyclass' => $pageclass,
     'lastheight' => null,
-    'padding' => 15
+    'padding' => 15,
+    'width' => $kalvidres->width,
+    'height' => $kalvidres->height
 );
 $PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);