diff --git a/filter.php b/filter.php index a5d2b68db5fd0567788a256d29401a7c8cffa067..8d66461ad060c4cc183fb2ad2fd7bc61905f77a2 100644 --- a/filter.php +++ b/filter.php @@ -40,7 +40,7 @@ require_once($CFG->libdir . '/oauthlib.php'); class filter_opencast extends moodle_text_filter { public function filter($text, array $options = array()) { - global $CFG, $PAGE; + global $PAGE; if (stripos($text, '</video>') === false) { // Performance shortcut - if there are no </video> tags, nothing can match. @@ -83,10 +83,13 @@ class filter_opencast extends moodle_text_filter { // Extract id. $id = substr($match, strpos($match, 'api/') + 4, 36); - $src = $CFG->wwwroot . '/filter/opencast/player/core.html?id=' . $id . '&ocurl=' . urlencode($baseurl); // Create link to video. - $link = $baseurl . '/engage/theodul/ui/core.html?id=' . $id; + $playerurl = get_config('filter_opencast', 'playerurl'); + $link = $baseurl . $playerurl .'?id=' . $id. '&mode=embed'; + + // Create source with embedded mode + $src = $link; // Collect the needed data being submitted to the template. $mustachedata = new stdClass(); diff --git a/lang/en/filter_opencast.php b/lang/en/filter_opencast.php index 7a97e5d56b44fe010bb9cb17b7be21e6eeb3176c..0a29a1f0f6f1633b1a1fc100f9b218e62300eacc 100644 --- a/lang/en/filter_opencast.php +++ b/lang/en/filter_opencast.php @@ -30,4 +30,6 @@ $string['setting_consumerkey_desc'] = 'LTI Consumer key'; $string['setting_consumersecret'] = 'Consumer secret'; $string['setting_consumersecret_desc'] = 'LTI Consumer secret'; $string['setting_engageurl'] = 'URL of the Opencast Engage server'; -$string['setting_engageurl_desc'] = 'If empty, the base URL of the admin tool is used.'; \ No newline at end of file +$string['setting_engageurl_desc'] = 'If empty, the base URL of the admin tool is used.'; +$string['setting_playerurl'] = 'URL of the Opencast player'; +$string['setting_playerurl_desc'] = 'Relative URL of the Opencast player, e.g. /engage/theodul/ui/core.html for the Theodul Pass Player.'; \ No newline at end of file diff --git a/me.json b/me.json new file mode 100644 index 0000000000000000000000000000000000000000..61adc3286ab7e59df8f23fcad7703f0460e5b267 --- /dev/null +++ b/me.json @@ -0,0 +1,108 @@ +{ + "org": { + "anonymousRole": "ROLE_ANONYMOUS", + "name": "Opencast Project", + "adminRole": "ROLE_ADMIN", + "id": "mh_default_org", + "properties": { + "admin.shortcut.general.series_view": "s", + "admin.shortcut.editor.split_at_current_time": "v", + "org.opencastproject.admin.ui.url": "https:\/\/electures-admin.uni-muenster.de", + "player.shortcut.controls.nextChapter": "pageup", + "engageui.annotations.enable": "true", + "player.matomo.server": "https:\/\/piwik.uni-muenster.de", + "admin.shortcut.player.mute": "m", + "admin.shortcut.general.select_previous_dashboard_filter": "F", + "player.shortcut.controls.jumpToBegin": "backspace", + "player.matomo.track_events": "play, pause, seek, ended, playbackrate, volume, quality, fullscreen, focus, layout_reset, zoom", + "admin.shortcut.editor.play_ending_of_current_segment": "n", + "player.mastervideotype": "presenter\/delivery", + "player.shortcut.layout.focusPrev": "<", + "org.opencastproject.admin.help.documentation.url": "http:\/\/docs.opencast.org", + "player.shortcut.controls.prevChapter": "pagedown", + "org.opencastproject.file.repo.url": "https:\/\/electures.uni-muenster.de", + "player.positioncontrols": "bottom", + "player.shortcut.zoom.moveLeft": "a", + "admin.notification.duration.success": "10", + "admin.shortcut.general.event_view": "e", + "admin.shortcut.editor.clear_list": "ctrl+backspace", + "adminui.user.external_role_display": "false", + "admin.shortcut.general.help": "?", + "org.opencastproject.admin.help.restdocs.url": "\/rest_docs.html", + "logo_mediamodule": "https:\/\/electures.uni-muenster.de\/images\/electures-icon.svg", + "admin.event.new.interval": "60", + "player.matomo.notification": "true", + "admin.shortcut.general.new_series": "N", + "engageui.link_mobile_redirect.description": "For more information have a look at the official site.", + "player.matomo.site_id": "53", + "player.shortcut.zoom.moveRight": "d", + "player.hide_video_context_menu": "true", + "player.shortcut.layout.movePiP": "p", + "player.shortcut.playbackrate.decrease": "T", + "admin.event.new.start_time": "08:05", + "admin.shortcut.general.select_next_dashboard_filter": "f", + "player.shortcut.zoom.in": "+", + "admin.shortcut.player.next_segment": "down", + "admin.shortcut.general.new_event": "n", + "admin.event.new.duration": "110", + "player.shortcut.controls.playPause": "space", + "admin.shortcut.player.next_frame": "right", + "player.shortcut.fullscreen.cancel": "escape", + "org.opencastproject.feed.url": "https:\/\/electures.uni-muenster.de", + "player.focusedflavor": "presentation", + "org.opencastproject.admin.mediamodule.url": "https:\/\/electures.uni-muenster.de\/engage\/ui", + "player.allowedtags": "engage-download,engage-streaming", + "admin.notification.duration.warning": "10", + "player.shortcut.zoom.moveUp": "w", + "player.shortcut.zoom.out": "-", + "player.shortcut.layout.focusNext": ">", + "player.shortcut-sequence": "controls,volume,playbackrate,layout,zoom,fullscreen", + "player.shortcut.controls.seekLeft": "left", + "admin.event.new.end_time": "19:55", + "player.shortcut.playbackrate.increase": "t", + "admin.shortcut.editor.play_current_segment_with_pre-roll": "C", + "org.opencastproject.engage.ui.url": "https:\/\/electures.uni-muenster.de", + "player.shortcut.volume.up": "9", + "adminui.chunksize": "2048", + "admin.shortcut.player.step_backward": "ctrl+left", + "admin.shortcut.editor.cut_selected_segment": "backspace", + "player.shortcut.controls.seekRight": "right", + "admin.shortcut.editor.play_current_segment": "c", + "logo_player": "https:\/\/electures.uni-muenster.de\/images\/electures-logo.svg", + "admin.shortcut.general.remove_filters": "r", + "player": "\/engage\/theodul\/ui\/core.html", + "player.matomo.heartbeat": "30", + "player.shortcut.volume.down": "8", + "admin.shortcut.general.main_menu": "m", + "engageui.link_download.enable": "false", + "engageui.links_media_module.enable": "true", + "engageui.link_mobile_redirect.enable": "false", + "login.display_defaults": "false", + "show_embed_links": "false", + "admin.shortcut.player.volume_up": "+", + "player.layout": "beside", + "player.shortcut.fullscreen.enable": "mod+enter", + "link_mediamodule": "true", + "admin.shortcut.player.previous_frame": "left", + "admin.shortcut.player.play_pause": "space", + "player.shortcut.volume.muteToggle": "m", + "admin.shortcut.player.volume_down": "-", + "engageui.link_mobile_redirect.url": "http:\/\/opencast.org\/", + "admin.shortcut.player.previous_segment": "up", + "org.opencastproject.oaipmh.server.hosturl": "https:\/\/electures.uni-muenster.de", + "player.shortcut.zoom.moveDown": "s", + "player.shortcut.layout.togglePiP": "o", + "admin.shortcut.player.step_forward": "ctrl+right" + } + }, + "roles": [ + "ROLE_ANONYMOUS" + ], + "userRole": "ROLE_USER_ANONYMOUS", + "user": { + "provider": null, + "name": null, + "email": null, + "username": "anonymous" + } +} \ No newline at end of file diff --git a/settings.php b/settings.php index 9851cb9dd45405c1adbcb1c6aedd0b6d841b778e..6bcfbe5a131547c13724611c51c72a1bd9c1eba3 100644 --- a/settings.php +++ b/settings.php @@ -33,5 +33,7 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configtext('filter_opencast/engageurl', get_string('setting_engageurl', 'filter_opencast'), get_string('setting_engageurl_desc', 'filter_opencast'), '')); - + $settings->add(new admin_setting_configtext('filter_opencast/playerurl', + get_string('setting_playerurl', 'filter_opencast'), + get_string('setting_playerurl_desc', 'filter_opencast'), '')); } diff --git a/version.php b/version.php index dd28bb73b3e275498798e035d0022ea884ff53e1..80f758199800156efc967764ff715360cd62e1cb 100644 --- a/version.php +++ b/version.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2018031901; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2018031902; // The current plugin version (Date: YYYYMMDDXX). $plugin->requires = 2017050500; // Requires this Moodle version. $plugin->component = 'filter_opencast'; // Full name of the plugin. \ No newline at end of file