@@ -14,4 +14,4 @@ |
||
14 | 14 | global $CFG; |
15 | 15 | |
16 | 16 | require_once(dirname(__FILE__).'/lib.php'); |
17 | -require_once($CFG->libdir . '/filelib.php'); |
|
17 | +require_once($CFG->libdir.'/filelib.php'); |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | require_login($course, false, $cm); |
35 | 35 | require_sesskey(); |
36 | 36 | |
37 | -if ( !isset($_FILES["audio-blob"]) && !isset($_FILES["video-blob"]) ) { |
|
37 | +if (!isset($_FILES["audio-blob"]) && !isset($_FILES["video-blob"])) { |
|
38 | 38 | $error = "Blob not included"; |
39 | 39 | debugging($error, DEBUG_DEVELOPER); |
40 | 40 | header("HTTP/1.0 400 Bad Request"); |
41 | 41 | return; |
42 | 42 | } |
43 | 43 | |
44 | -if ( !isset($_POST["audio-filename"]) && !isset($_POST["video-filename"]) ) { |
|
44 | +if (!isset($_POST["audio-filename"]) && !isset($_POST["video-filename"])) { |
|
45 | 45 | $error = "Filename not included"; |
46 | 46 | debugging($error, DEBUG_DEVELOPER); |
47 | 47 | header("HTTP/1.0 400 Bad Request"); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | $filename = $_POST["audio-filename"]; |
52 | 52 | $filetmp = $_FILES["audio-blob"]["tmp_name"]; |
53 | -if ( !isset($_FILES["audio-blob"]) || !isset($_POST["audio-filename"]) ) { |
|
53 | +if (!isset($_FILES["audio-blob"]) || !isset($_POST["audio-filename"])) { |
|
54 | 54 | $filename = $_POST["video-filename"]; |
55 | 55 | $filetmp = $_FILES["video-blob"]["tmp_name"]; |
56 | 56 | } |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | // Prepare file record object. |
61 | 61 | $usercontext = context_user::instance($USER->id); |
62 | 62 | $fileinfo = array( |
63 | - 'contextid' => $usercontext->id, // ID of context. |
|
63 | + 'contextid' => $usercontext->id, // ID of context. |
|
64 | 64 | 'component' => 'tinymce_recordrtc', // Usually = table name. |
65 | - 'filearea' => 'annotation', // Usually = table name. |
|
66 | - 'itemid' => time(), // Usually = ID of row in table. |
|
67 | - 'filepath' => '/', // Any path beginning and ending in "/". |
|
68 | - 'filename' => $filename, // Any filename. |
|
65 | + 'filearea' => 'annotation', // Usually = table name. |
|
66 | + 'itemid' => time(), // Usually = ID of row in table. |
|
67 | + 'filepath' => '/', // Any path beginning and ending in "/". |
|
68 | + 'filename' => $filename, // Any filename. |
|
69 | 69 | 'author' => fullname($USER), |
70 | 70 | 'licence' => $CFG->sitedefaultlicense |
71 | 71 | ); |
@@ -60,18 +60,18 @@ |
||
60 | 60 | // Prepare file record object. |
61 | 61 | $usercontext = context_user::instance($USER->id); |
62 | 62 | $fileinfo = array( |
63 | - 'contextid' => $usercontext->id, // ID of context. |
|
64 | - 'component' => 'tinymce_recordrtc', // Usually = table name. |
|
65 | - 'filearea' => 'annotation', // Usually = table name. |
|
66 | - 'itemid' => time(), // Usually = ID of row in table. |
|
67 | - 'filepath' => '/', // Any path beginning and ending in "/". |
|
68 | - 'filename' => $filename, // Any filename. |
|
69 | - 'author' => fullname($USER), |
|
70 | - 'licence' => $CFG->sitedefaultlicense |
|
71 | - ); |
|
63 | + 'contextid' => $usercontext->id, // ID of context. |
|
64 | + 'component' => 'tinymce_recordrtc', // Usually = table name. |
|
65 | + 'filearea' => 'annotation', // Usually = table name. |
|
66 | + 'itemid' => time(), // Usually = ID of row in table. |
|
67 | + 'filepath' => '/', // Any path beginning and ending in "/". |
|
68 | + 'filename' => $filename, // Any filename. |
|
69 | + 'author' => fullname($USER), |
|
70 | + 'licence' => $CFG->sitedefaultlicense |
|
71 | + ); |
|
72 | 72 | $filesaved = $fs->create_file_from_pathname($fileinfo, $filetmp); |
73 | 73 | |
74 | 74 | // OK response. |
75 | 75 | $filetarget = $filesaved->get_contextid().'/'.$filesaved->get_component().'/'.$filesaved->get_filearea().'/'. |
76 | - $filesaved->get_itemid().'/'.$filesaved->get_filename(); |
|
76 | + $filesaved->get_itemid().'/'.$filesaved->get_filename(); |
|
77 | 77 | echo($filetarget); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | 'both'=>get_string('both', 'tinymce_recordrtc'), |
29 | 29 | 'audio'=>get_string('onlyaudio', 'tinymce_recordrtc'), |
30 | 30 | 'video'=>get_string('onlyvideo', 'tinymce_recordrtc') |
31 | - ); |
|
31 | + ); |
|
32 | 32 | $settings->add(new admin_setting_configselect('tinymce_recordrtc/allowedtypes', |
33 | 33 | get_string('allowedtypes', 'tinymce_recordrtc'), '', '', $options)); |
34 | 34 | $settings->add(new admin_setting_configtext_with_maxlength('tinymce_recordrtc/timelimit', |
@@ -43,8 +43,8 @@ |
||
43 | 43 | // Reset page layout for inside editor. |
44 | 44 | $PAGE->set_pagelayout('embedded'); |
45 | 45 | |
46 | -$PAGE->requires->css( new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/css/style.css') ); |
|
47 | -$PAGE->requires->js( new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/js/detector.js') ); |
|
46 | +$PAGE->requires->css(new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/css/style.css')); |
|
47 | +$PAGE->requires->js(new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/js/detector.js')); |
|
48 | 48 | |
49 | 49 | $jsvars = array( |
50 | 50 | 'contextid' => $contextid, |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'sesskey' => sesskey(), |
62 | 62 | 'type' => 'audiortc', |
63 | 63 | 'timelimit' => $this->get_config('timelimit'), '120' |
64 | - ); |
|
64 | + ); |
|
65 | 65 | $this->add_button_after($params, 0, 'audiortc'); |
66 | 66 | } |
67 | 67 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | 'sesskey' => sesskey(), |
74 | 74 | 'type' => 'videortc', |
75 | 75 | 'timelimit' => $this->get_config('timelimit'), '120' |
76 | - ); |
|
76 | + ); |
|
77 | 77 | $this->add_button_after($params, 0, 'videortc'); |
78 | 78 | } |
79 | 79 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | class tinymce_recordrtc extends editor_tinymce_plugin { |
33 | 33 | /** @var array list of buttons defined by this plugin */ |
34 | - protected $buttons = array('recordrtc','audiortc','videortc'); |
|
34 | + protected $buttons = array('recordrtc', 'audiortc', 'videortc'); |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Adjusts TinyMCE init parameters for tinymce_recordrtc |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | // Add audio button at the end of the first row. |
56 | 56 | $allowedtypes = $this->get_config('allowedtypes', 'both'); |
57 | - if ( $allowedtypes == 'both' || $allowedtypes == 'audio') { |
|
57 | + if ($allowedtypes == 'both' || $allowedtypes == 'audio') { |
|
58 | 58 | // Add parameters for audiortc. |
59 | 59 | $params['audiortc'] = array( |
60 | 60 | 'contextid' => $options['context']->id, |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | // Add video button at the end of the first row. |
69 | - if ( $allowedtypes == 'both' || $allowedtypes == 'video') { |
|
69 | + if ($allowedtypes == 'both' || $allowedtypes == 'video') { |
|
70 | 70 | // Add parameters for audiortc. |
71 | 71 | $params['videortc'] = array( |
72 | 72 | 'contextid' => $options['context']->id, |
@@ -43,8 +43,8 @@ |
||
43 | 43 | // Reset page layout for inside editor. |
44 | 44 | $PAGE->set_pagelayout('embedded'); |
45 | 45 | |
46 | -$PAGE->requires->css( new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/css/style.css') ); |
|
47 | -$PAGE->requires->js( new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/js/detector.js') ); |
|
46 | +$PAGE->requires->css(new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/css/style.css')); |
|
47 | +$PAGE->requires->js(new moodle_url($CFG->wwwroot.MOODLE_TINYMCE_RECORDRTC_ROOT.'tinymce/js/detector.js')); |
|
48 | 48 | |
49 | 49 | $jsvars = array( |
50 | 50 | 'contextid' => $contextid, |