Revision: 6
Author: [email protected]
Date: Mon Feb 18 10:08:45 2013
Log: 2.4.1 compatibility update
http://code.google.com/a/apache-extras.org/p/openmeetings-moodle-plugin/source/detail?r=6
Modified:
/trunk/db/access.php
/trunk/lang/de/openmeetings.php
/trunk/lang/en/openmeetings.php
/trunk/lang/es/openmeetings.php
/trunk/lang/fr/openmeetings.php
/trunk/lang/pt_br/openmeetings.php
/trunk/lang/ru/openmeetings.php
/trunk/mod_form.php
=======================================
--- /trunk/db/access.php Thu Oct 11 02:10:22 2012
+++ /trunk/db/access.php Mon Feb 18 10:08:45 2013
@@ -1,11 +1,11 @@
<?php
/*
-* Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
-* "License") + you may not use this file except in compliance
+ * "License") + you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -51,18 +51,25 @@
$capabilities = array(
-
- 'mod/openmeetings:becomemoderator' => array(
-
- 'captype' => 'read',
- 'contextlevel' => CONTEXT_MODULE,
- 'legacy' => array(
- 'teacher' => CAP_ALLOW,
- 'editingteacher' => CAP_ALLOW,
- 'manager' => CAP_ALLOW
- )
- )
-
+ 'mod/openmeetings:addinstance' => array(
+ 'riskbitmask' => RISK_XSS,
+ 'captype' => 'write',
+ 'contextlevel' => CONTEXT_COURSE,
+ 'archetypes' => array(
+ 'editingteacher' => CAP_ALLOW,
+ 'manager' => CAP_ALLOW
+ ),
+ 'clonepermissionsfrom' =>
'moodle/course:manageactivities'
+ )
+ , 'mod/openmeetings:becomemoderator' => array(
+ 'captype' => 'read',
+ 'contextlevel' => CONTEXT_MODULE,
+ 'legacy' => array(
+ 'teacher' => CAP_ALLOW,
+ 'editingteacher' => CAP_ALLOW,
+ 'manager' => CAP_ALLOW
+ )
+ )
);
?>
=======================================
--- /trunk/lang/de/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/de/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/lang/en/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/en/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/lang/es/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/es/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/lang/fr/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/fr/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/lang/pt_br/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/pt_br/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/lang/ru/openmeetings.php Thu Oct 11 02:10:22 2012
+++ /trunk/lang/ru/openmeetings.php Mon Feb 18 10:08:45 2013
@@ -19,6 +19,7 @@
*/
$string['openmeetings'] = 'openmeetings';
+$string['openmeetings:addinstance'] = 'Add instance of Openmeetings';
$string['modulename'] = 'OpenMeetings';
$string['modulenameplural'] = 'OpenMeetings';
=======================================
--- /trunk/mod_form.php Thu Oct 11 02:10:22 2012
+++ /trunk/mod_form.php Mon Feb 18 10:08:45 2013
@@ -156,7 +156,9 @@
}
}
-$mform = new mod_openmeetings_mod_form();
+global $data, $cm;
+$course = $DB->get_record('course', array('id'=>$data->course), '*',
MUST_EXIST);
+$mform = new mod_openmeetings_mod_form($data, $data->section, $cm,
$course);
if ($mform->no_submit_button_pressed() && $om_login) {
$type = isset($mform->get_submitted_data()->{'avi'}) ? "avi" :