// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017021300, 'tool', 'monitor');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'cas');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017032800, 'auth', 'db');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'email');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'fc');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'imap');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'ldap');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'manual');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'mnet');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'nntp');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'none');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'pam');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'pop3');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017020700, 'auth', 'shibboleth');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
$isuseroverride = !$data->courseid && $data->modulename && $data->instance;
// If we don't want to include user data and this record is a user override event
- // for an activity then we should not create it.
- if (!$this->task->get_setting_value('userinfo') && $isuseroverride) {
+ // for an activity then we should not create it. (Only activity events can be user override events - which must have this
+ // setting).
+ if ($isuseroverride && $this->task->setting_exists('userinfo') && !$this->task->get_setting_value('userinfo')) {
return;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
\ No newline at end of file
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
$class .= ' duration_finish';
}
$data = array(
- 'url' => $dayhref,
+ 'url' => $dayhref->out(false),
'day' => $day,
'content' => $popupdata['data-core_calendar-popupcontent'],
'title' => $popupdata['data-core_calendar-title']
upgrade_plugin_savepoint(true, 2017020200, 'format', 'topics');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017050300, 'format', 'weeks');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017011300, 'enrol', 'lti');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017042602, 'filter', 'mathjaxloader');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
</select></div></td>
<td id="buttonscell">
<p class="arrow_button">
- <input name="add" id="add" type="submit"
+ <input class="btn btn-secondary" name="add" id="add" type="submit"
value="<?php echo $OUTPUT->larrow().' '.get_string('add'); ?>"
title="<?php print_string('add'); ?>" /><br>
- <input name="remove" id="remove" type="submit"
+ <input class="btn btn-secondary" name="remove" id="remove" type="submit"
value="<?php echo get_string('remove').' '.$OUTPUT->rarrow(); ?>"
title="<?php print_string('remove'); ?>" />
</p>
</td>
</tr>
<tr><td colspan="3" id="backcell">
- <input type="submit" name="cancel" value="<?php print_string('backtogroupings', 'group'); ?>" />
+ <input class="btn btn-secondary" type="submit" name="cancel"
+ value="<?php print_string('backtogroupings', 'group'); ?>" />
</td></tr>
</table>
</div>
}
echo '</select>'."\n";
-echo '<p><input type="submit" name="act_updatemembers" id="updatemembers" value="'
+echo '<p><input class="btn btn-secondary" type="submit" name="act_updatemembers" id="updatemembers" value="'
. get_string('showmembersforgroup', 'group') . '" /></p>'."\n";
-echo '<p><input type="submit" '. $showeditgroupsettingsform_disabled . ' name="act_showgroupsettingsform" id="showeditgroupsettingsform" value="'
+echo '<p><input class="btn btn-secondary" type="submit" '. $showeditgroupsettingsform_disabled .
+ ' name="act_showgroupsettingsform" id="showeditgroupsettingsform" value="'
. get_string('editgroupsettings', 'group') . '" /></p>'."\n";
-echo '<p><input type="submit" '. $deletegroup_disabled . ' name="act_deletegroup" id="deletegroup" value="'
+echo '<p><input class="btn btn-secondary" type="submit" '. $deletegroup_disabled .
+ ' name="act_deletegroup" id="deletegroup" value="'
. get_string('deleteselectedgroup', 'group') . '" /></p>'."\n";
-echo '<p><input type="submit" name="act_showcreateorphangroupform" id="showcreateorphangroupform" value="'
+echo '<p><input class="btn btn-secondary" type="submit" name="act_showcreateorphangroupform" id="showcreateorphangroupform" value="'
. get_string('creategroup', 'group') . '" /></p>'."\n";
-echo '<p><input type="submit" name="act_showautocreategroupsform" id="showautocreategroupsform" value="'
+echo '<p><input class="btn btn-secondary" type="submit" name="act_showautocreategroupsform" id="showautocreategroupsform" value="'
. get_string('autocreategroups', 'group') . '" /></p>'."\n";
-echo '<p><input type="submit" name="act_showimportgroups" id="showimportgroups" value="'
+echo '<p><input class="btn btn-secondary" type="submit" name="act_showimportgroups" id="showimportgroups" value="'
. get_string('importgroups', 'core_group') . '" /></p>'."\n";
echo html_writer::end_tag('div');
echo '</select>'."\n";
-echo '<p><input type="submit" ' . $showaddmembersform_disabled . ' name="act_showaddmembersform" '
+echo '<p><input class="btn btn-secondary" type="submit" ' . $showaddmembersform_disabled . ' name="act_showaddmembersform" '
. 'id="showaddmembersform" value="' . get_string('adduserstogroup', 'group'). '" /></p>'."\n";
echo html_writer::end_tag('div');
echo html_writer::end_tag('div');
</td>
<td id='buttonscell'>
<p class="arrow_button">
- <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().' '.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
- <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').' '.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
+ <input class="btn btn-secondary" name="add" id="add"
+ type="submit" value="<?php echo $OUTPUT->larrow().' '.get_string('add'); ?>"
+ title="<?php print_string('add'); ?>" /><br />
+ <input class="btn btn-secondary" name="remove" id="remove"
+ type="submit" value="<?php echo get_string('remove').' '.$OUTPUT->rarrow(); ?>"
+ title="<?php print_string('remove'); ?>" />
</p>
</td>
<td id='potentialcell'>
</td>
</tr>
<tr><td colspan="3" id='backcell'>
- <input type="submit" name="cancel" value="<?php print_string('backtogroups', 'group'); ?>" />
+ <input class="btn btn-secondary" type="submit" name="cancel"
+ value="<?php print_string('backtogroups', 'group'); ?>" />
</td></tr>
</table>
</div>
$string['remotedownloaderror'] = '<p>دانلود کامپوننت بر روی کارگزار شما ناموفق بود. لطفا تنظیمات پروکسی را بررسی کنید؛ افزونهٔ پیاچپی cURL بسیار توصیه میشود.</p>
<p>باید بهصورت دستی فایل <a href="{$a->url}">{$a->url}</a> را دریافت کنید، آن را در «{$a->dest}» در کارگزار خود کپی کنید و آنجا از حالت فشرده خارج کنید.</p>';
$string['wrongdestpath'] = 'مسیر مقصد اشتباه';
+$string['wrongsourcebase'] = 'آدرس اینترنتی پایهٔ اشتباه';
$string['wrongzipfilename'] = 'نام فایل ZIP اشتباه';
$string['pathswrongadmindir'] = 'دایرکتوری مدیر وجود ندارد';
$string['phpextension'] = 'افزونهٔ {$a} در PHP';
$string['phpversion'] = 'نسخهٔ PHP';
-$string['phpversionhelp'] = '<p>مودل نیاز به PHP نسخهٔ حداقل 5.6.5 دارد (<span dir="ltr" style="direction: ltr; display: inline-block">7.x</span> محدودیتهایی در engine اش دارد).</p>
+$string['phpversionhelp'] = '<p>مودل نیاز به PHP نسخهٔ حداقل 5.6.5 یا 7.1 دارد (<span dir="ltr" style="direction: ltr; display: inline-block">7.0.x</span> محدودیتهایی در engine اش دارد).</p>
<p>شما در حال حاضر از نسخهٔ {$a} استفاده میکنید</p>
<p>باید PHP را ارتقاء دهید یا از کارگزاری دارای نسخهٔ جدیدتر PHP استفاده نمائید.</p>';
$string['welcomep10'] = '{$a->installername} (<span dir="ltr">{$a->installerversion}</span>)';
$string['pathswrongadmindir'] = 'De adminmap bestaat niet';
$string['phpextension'] = '{$a} PHP-extentie';
$string['phpversion'] = 'PHP-versie';
-$string['phpversionhelp'] = '<p>Moodle heeft minstens PHP-versie 4.3.0 of 5.1.0 nodig (5.0.x heeft veel bekende problemen).</p> <p>De huidige versie op je server is {$a}</p>
-<p>Je moet PHP upgraden of verhuizen naar een host met een nieuwere versie van PHP!<br />(Als je 5.0.x draait, kun je ook downgraden naar versie 4.4.x)</p>';
+$string['phpversionhelp'] = '<p>Moodle heeft minstens PHP-versie 5.6.5 of 7.1 nodig (7.0.x heeft een aantal beperkingen).</p>
+<p>De huidige versie op je server is {$a}</p>
+<p>Je moet PHP upgraden of verhuizen naar een host met een nieuwere versie van PHP.<br />';
$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
$string['welcomep20'] = 'Je krijgt deze pagina te zien omdat je met succes het <strong>{$a->packname} {$a->packversion}</strong> packet op je computer gezet en gestart hebt. Proficiat!';
$string['welcomep30'] = 'Deze uitgave van <strong>{$a->installername}</strong> bevat de software die nodig is om een omgeving te creëren waarin <strong>Moodle</strong> zal werken, namelijk:';
$string['completionexpected'] = 'Expect completed on';
$string['completionexpected_help'] = 'This setting specifies the date when the activity is expected to be completed.';
$string['completionexpecteddesc'] = 'Completion expected on {$a}';
-$string['completionexpectedfor'] = 'Expected completion for \'{$a->modulename}\' activity \'{$a->instancename}\'';
+$string['completionexpectedfor'] = '{$a->instancename} should be completed';
$string['completionicons'] = 'Completion tick boxes';
$string['completionicons_help'] = 'A tick next to an activity name may be used to indicate when the activity is complete.
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_main_savepoint(true, 2017050900.01);
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
\ No newline at end of file
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// This link doesn't have a unique display for course context so only display it under the user's profile.
if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) {
$url = new moodle_url('/user/files.php');
- $usernode->add(get_string('privatefiles'), $url, self::TYPE_SETTING);
+ $usernode->add(get_string('privatefiles'), $url, self::TYPE_SETTING, null, 'privatefiles');
}
// Add a node to view the users notes if permitted.
$usercontext = context_user::instance($USER->id);
if (has_capability('moodle/user:manageownfiles', $usercontext)) {
$url = new moodle_url('/user/files.php');
- $node = $coursenode->add(get_string('privatefiles'), $url, self::TYPE_SETTING);
+ $node = $coursenode->add(get_string('privatefiles'), $url, self::TYPE_SETTING, null, 'privatefiles');
$node->display = false;
$node->showinflatnavigation = true;
}
// This link doesn't have a unique display for course context so only display it under the user's profile.
if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) {
$url = new moodle_url('/user/files.php');
- $dashboard->add(get_string('privatefiles'), $url, self::TYPE_SETTING);
+ $dashboard->add(get_string('privatefiles'), $url, self::TYPE_SETTING, null, 'privatefiles');
}
// Add a node to view the users notes if permitted.
case STATS_REPORT_ACTIVITYBYROLE;
$param->fields = 'stat1 AS line1, stat2 AS line2';
$param->stattype = 'activity';
- $role = $DB->get_record('role', array('id' => $roleid));
- $rolename = role_get_name($role, context_course::instance($courseid));
+ $rolename = '';
+ if ($roleid <> 0) {
+ if ($role = $DB->get_record('role', ['id' => $roleid])) {
+ $rolename = role_get_name($role, context_course::instance($courseid)) . ' ';
+ }
+ }
$param->line1 = $rolename . get_string('statsreads');
$param->line2 = $rolename . get_string('statswrites');
if ($courseid == SITEID) {
case STATS_MODE_GENERAL:
$reportoptions[STATS_REPORT_ACTIVITY] = get_string('statsreport'.STATS_REPORT_ACTIVITY);
if ($courseid != SITEID && $context = context_course::instance($courseid)) {
- $sql = 'SELECT r.id, r.name FROM {role} r JOIN {stats_daily} s ON s.roleid = r.id WHERE s.courseid = :courseid GROUP BY r.id, r.name';
+ $sql = 'SELECT r.id, r.name, r.shortname FROM {role} r JOIN {stats_daily} s ON s.roleid = r.id
+ WHERE s.courseid = :courseid GROUP BY r.id, r.name, r.shortname';
if ($roles = $DB->get_records_sql($sql, array('courseid' => $courseid))) {
foreach ($roles as $role) {
$reportoptions[STATS_REPORT_ACTIVITYBYROLE.$role->id] = get_string('statsreport'.STATS_REPORT_ACTIVITYBYROLE).
- ' ' . format_string($role->name, true, ['context' => $context]);
+ ' ' . role_get_name($role, $context);
}
}
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2016122100, 'message', 'popup');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_mod_savepoint(true, 2017042800, 'assign');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017022700, 'assignfeedback', 'editpdf');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
}
$cangrade = has_capability('mod/assign:grade', $this->get_context());
+ $hasgrade = $this->get_instance()->grade != GRADE_TYPE_NONE &&
+ !is_null($gradebookgrade) && !is_null($gradebookgrade->grade);
+ $gradevisible = $cangrade || $this->get_instance()->grade == GRADE_TYPE_NONE ||
+ (!is_null($gradebookgrade) && !$gradebookgrade->hidden);
// If there is a visible grade, show the summary.
- if (!is_null($gradebookgrade) && (!is_null($gradebookgrade->grade) || !$emptyplugins)
- && ($cangrade || !$gradebookgrade->hidden)) {
+ if (($hasgrade || !$emptyplugins) && $gradevisible) {
$gradefordisplay = null;
$gradeddate = null;
$grader = null;
$gradingmanager = get_grading_manager($this->get_context(), 'mod_assign', 'submissions');
- // Only show the grade if it is not hidden in gradebook.
- if (!is_null($gradebookgrade->grade) && ($cangrade || !$gradebookgrade->hidden)) {
+ if ($hasgrade) {
if ($controller = $gradingmanager->get_active_controller()) {
$menu = make_grades_menu($this->get_instance()->grade);
$controller->set_grade_range($menu, $this->get_instance()->grade > 0);
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_mod_savepoint(true, 2017032800, 'data');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_mod_savepoint(true, 2017032800, 'feedback');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_mod_savepoint(true, 2016120516, 'lesson');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
<div>
<div class="fitem fitem_actionbuttons fitem_fsubmit">
<fieldset class="felement fsubmit">
- <input id="id_submitbutton" type="submit" name="submit" value="<?php
+ <input id="id_submitbutton" type="submit" name="submit" class="btn btn-primary" value="<?php
print_string('save', 'quiz'); ?>"/>
</fieldset>
</div>
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
}
}
+ // If CBM is involved, don't show the warning for grade to pass being larger than the maximum grade.
+ if (($data['preferredbehaviour'] == 'deferredcbm') OR ($data['preferredbehaviour'] == 'immediatecbm')) {
+ unset($errors['gradepass']);
+ }
// Any other rule plugins.
$errors = quiz_access_manager::validate_settings_form_fields($errors, $data, $files, $this);
M.mod_quiz.init_comment_popup = function(Y) {
// Add a close button to the window.
- var closebutton = Y.Node.create('<input type="button" />');
+ var closebutton = Y.Node.create('<input type="button" class="btn btn-secondary" />');
closebutton.set('value', M.util.get_string('cancel', 'moodle'));
Y.one('#id_submitbutton').ancestor().append(closebutton);
Y.on('click', function() { window.close() }, closebutton);
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Skip view page.
$skipviewoptions = scorm_get_skip_view_array();
- if ($COURSE->format == 'singleactivity') { // Remove option that would cause a constant redirect.
- unset($skipviewoptions[SCORM_SKIPVIEW_ALWAYS]);
- if ($cfgscorm->skipview == SCORM_SKIPVIEW_ALWAYS) {
- $cfgscorm->skipview = SCORM_SKIPVIEW_FIRST;
- }
- }
$mform->addElement('select', 'skipview', get_string('skipview', 'scorm'), $skipviewoptions);
$mform->addHelpButton('skipview', 'skipview', 'scorm');
$mform->setDefault('skipview', $cfgscorm->skipview);
// Print the page header.
if (empty($scorm->popup) || $displaymode == 'popup') {
- // Redirect back to the correct section if one section per page is being used.
- $exiturl = course_get_url($course, $cm->sectionnum);
+ if ($course->format == 'singleactivity' && $scorm->skipview == SCORM_SKIPVIEW_ALWAYS
+ && !has_capability('mod/scorm:viewreport', context_module::instance($cm->id))) {
+ // Redirect students back to site home to avoid redirect loop.
+ $exiturl = $CFG->wwwroot;
+ } else {
+ // Redirect back to the correct section if one section per page is being used.
+ $exiturl = course_get_url($course, $cm->sectionnum);
+ }
$exitlink = html_writer::link($exiturl, $strexit, array('title' => $strexit));
$PAGE->set_button($exitlink);
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// 'create' action will create a new page in db, and redirect to
// page editing page.
$action = optional_param('action', 'new', PARAM_TEXT);
-// The title of the new page, can be empty
-$title = optional_param('title', get_string('newpage', 'wiki'), PARAM_TEXT);
$wid = optional_param('wid', 0, PARAM_INT);
$swid = optional_param('swid', 0, PARAM_INT);
$group = optional_param('group', 0, PARAM_INT);
require_login($course, true, $cm);
+// The title of the new page, cannot be empty.
+$title = optional_param('title', get_string('newpage', 'wiki'), PARAM_TEXT);
$wikipage = new page_wiki_create($wiki, $subwiki, $cm);
if (!empty($swid)) {
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
if (isset($this->question->id)) {
$mform->insertElementBefore($mform->createElement('static', 'initialname',
get_string('questionstoredname', 'qtype_calculated'),
- $this->initialname), 'name');
+ format_string($this->initialname, true, array('context' => $this->context))), 'name');
};
$addfieldsname = 'updatecategory';
$addstring = get_string('updatecategory', 'qtype_calculated');
if (isset($this->question->id)) {
$mform->insertElementBefore($mform->createElement('static', 'initialname',
get_string('questionstoredname', 'qtype_calculated'),
- $this->initialname), 'name');
+ format_string($this->initialname, true, array('context' => $this->context))), 'name');
};
$addfieldsname = 'updatecategory';
$addstring = get_string('updatecategory', 'qtype_calculated');
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
$table->width = 'auto';
if ($mode == STATS_MODE_DETAILED) {
- $param = stats_get_parameters($time, null, $course->id, $mode); // we only care about the table and the time string (if we have time)
+ $param = stats_get_parameters($time, null, $course->id, $mode, $roleid); // We only care about the table and the time string (if we have time).
list($sort, $moreparams) = users_order_by_sql('u');
$moreparams['courseid'] = $course->id;
print_error('reportnotavailable');
}
- $param = stats_get_parameters($time,$report,$course->id,$mode);
+ $param = stats_get_parameters($time, $report, $course->id, $mode, $roleid);
if ($mode == STATS_MODE_DETAILED) {
$param->table = 'user_'.$param->table;
$stats = stats_fix_zeros($stats,$param->timeafter,$param->table,(!empty($param->line2)));
- echo $OUTPUT->heading(format_string($course->shortname).' - '.get_string('statsreport'.$report)
- .((!empty($user)) ? ' '.get_string('statsreportforuser').' ' .fullname($user,true) : '')
- .((!empty($roleid)) ? ' '.$DB->get_field('role','name', array('id'=>$roleid)) : ''));
+ $rolename = '';
+ $userdisplayname = '';
+ $coursecontext = context_course::instance($course->id);
+ if (!empty($roleid) && $role = $DB->get_record('role', ['id' => $roleid])) {
+ $rolename = ' ' . role_get_name($role, $coursecontext);
+ }
+ if (!empty($user)) {
+ $userdisplayname = ' ' . fullname($user, true);
+ }
+ echo $OUTPUT->heading(
+ format_string($course->shortname) .
+ ' - ' .
+ get_string('statsreport' . $report) .
+ $rolename .
+ $userdisplayname
+ );
if ($mode == STATS_MODE_DETAILED) {
report_stats_print_chart($course->id, $report, $time, $mode, $userid);
stats_check_uptodate($course->id);
- $param = stats_get_parameters($time, $report, $course->id, $mode);
+ $param = stats_get_parameters($time, $report, $course->id, $mode, $roleid);
if (!empty($userid)) {
$param->table = 'user_' . $param->table;
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
upgrade_plugin_savepoint(true, 2017030600, 'repository', 'googledocs');
}
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
$dbman = $DB->get_manager();
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
// Automatically generated Moodle v3.2.0 release upgrade line.
// Put any upgrade step following this.
+ // Automatically generated Moodle v3.3.0 release upgrade line.
+ // Put any upgrade step following this.
+
return true;
}
defined('MOODLE_INTERNAL') || die();
-$version = 2017051500.01; // YYYYMMDD = weekly release date of this DEV branch.
+$version = 2017052500.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
-$release = '3.4dev (Build: 20170519)'; // Human-friendly version name
+$release = '3.4dev (Build: 20170525)'; // Human-friendly version name
$branch = '34'; // This version's branch.
$maturity = MATURITY_ALPHA; // This version's maturity level.
