print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
}
-if (ini_get_bool('magic_quotes_runtime')) {
- print_error('phpvaroff', 'debug', '', (object)array('name'=>'magic_quotes_runtime', 'link'=>$documentationlink));
-}
-
if (!ini_get_bool('file_uploads')) {
print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
}
// Check for valid admin user - no guest autologin
require_login(0, false);
+if (isguestuser()) {
+ // Login as real user!
+ $SESSION->wantsurl = (string)new moodle_url('/admin/index.php');
+ redirect(get_login_url());
+}
$context = context_system::instance();
require_capability('moodle/site:config', $context);
'moodle/backup:backupcourse',
'moodle/category:manage',
'moodle/course:create',
- 'moodle/site:approvecourse'
+ 'moodle/site:approvecourse',
+ 'moodle/restore:restorecourse'
);
if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
// Speedup for non-admins, add all caps used on this page.
array('moodle/category:manage')
)
);
+ $ADMIN->add('courses',
+ new admin_externalpage('restorecourse', new lang_string('restorecourse', 'admin'),
+ new moodle_url('/backup/restorefile.php', array('contextid' => context_system::instance()->id)),
+ array('moodle/course:create')
+ )
+ );
// Course Default Settings Page.
// NOTE: these settings must be applied after all other settings because they depend on them.
$temp->add(new admin_setting_configcheckbox('enabletgzbackups',
new lang_string('enabletgzbackups', 'admin'),
new lang_string('enabletgzbackups_desc', 'admin'), 0));
- $temp->add(new admin_setting_php_extension_enabled('zlibenabled',
- get_string('zlibenabled', 'admin'),
- get_string('enabletgzbackups_nozlib', 'admin'), 'zlib'));
$ADMIN->add('experimental', $temp);
}
}
-class problem_000006 extends problem_base {
- function title() {
- return 'PHP: magic_quotes_runtime is enabled';
- }
- function exists() {
- return (ini_get_bool('magic_quotes_runtime'));
- }
- function severity() {
- return SEVERITY_SIGNIFICANT;
- }
- function description() {
- return 'Your PHP configuration includes an enabled setting, magic_quotes_runtime, that <strong>must be disabled</strong> in order for Moodle to work correctly. Notable symptoms arising from this misconfiguration include strange display errors whenever a text field that includes single or double quotes is processed.';
- }
- function solution() {
- global $CFG;
- return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>magic_quotes_runtime = On</pre> and change it to <pre>magic_quotes_runtime = Off</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value magic_quotes_runtime "Off"</pre></li></ol>';
- }
-}
-
class problem_000007 extends problem_base {
function title() {
return 'PHP: file_uploads is disabled';
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['multilangupgradeinfo'] = 'The multilang filter syntax was changed in 1.8, <lang> tag is not supported any more. <br /><br />Example: <span lang="en" class="multilang">Hello!</span><span lang="es" class="multilang">Hola!</span><br /><br /><strong>Do you want to upgrade the syntax in all existing texts now?</strong>';
+$string['multilangupgradeinfo'] = '<p>The multilang filter syntax was changed in 1.8 and so the <lang> tag is not supported any more.</p>
+<p>Example: <span lang="en" class="multilang">Hello!</span><span lang="es" class="multilang">Hola!</span></p>
+<p>Do you want to upgrade the syntax in all existing texts now?</p>';
$string['pluginname'] = 'Multilang upgrade';
$qtypes = core_component::get_plugin_list('qtype');
foreach ($qtypes as $qtype => $notused) {
- $qtypes[$qtype] = get_string($qtype, 'qtype_' . $qtype);
+ $qtypes[$qtype] = get_string('pluginname', 'qtype_' . $qtype);
}
$mform->addElement('header', 'h1', 'Either extract a specific question_session');
$string['spamauto'] = 'Autodetect common spam patterns';
$string['spamcannotdelete'] = 'Cannot delete this user';
$string['spamcannotfinduser'] = 'No users matching your search';
-$string['spamcleanerintro'] = 'This script allows you to search all user profiles for certain strings and then delete those accounts which are obviously created by spammers. You can search for multiple keywords using commas (eg casino, porn)<br /><br />Moodle docs has more information about <a href="http://docs.moodle.org/en/Reducing_spam_in_Moodle">Reducing spam in Moodle</a>.';
+$string['spamcleanerintro'] = '<p>This script allows you to search all user profiles for certain strings and then delete those accounts which are obviously created by spammers. You can search for multiple keywords using commas (e.g. casino, porn).</p>
+<p>For further information, see the documentation <a href="http://docs.moodle.org/en/Reducing_spam_in_Moodle">Reducing spam in Moodle</a>.</p>';
$string['spamdeleteall'] = 'Delete all these user accounts';
$string['spamdeleteallconfirm'] = 'Are you sure you want to delete all these user accounts? You can not undo this.';
$string['spamdeleteconfirm'] = 'Are you sure you want to delete this entry? You can not undo this.';
$string['wrongnumberofreffields'] = 'Wrong number of reference fields';
$string['wrongreservedwords'] = 'Currently used reserved words<br />(note that table names aren\'t important if using $CFG->prefix)';
$string['wrongoraclesemantics'] = 'Wrong Oracle BYTE semantics found';
-$string['yesmissingindexesfound'] = 'Some missing indexes have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them (don\'t forget to backup your data before doing that).<br /><br />After doing that, it\'s highly recommended to execute this utility again to check that no more missing indexes are found.';
-$string['yeswrongdefaultsfound'] = 'Some inconsistent defaults have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to fix them all (don\'t forget to backup your data before doing that).<br /><br />After doing that, it\'s highly recommended to execute this utility again to check that no more inconsistent defaults are found.';
-$string['yeswrongintsfound'] = 'Some wrong integers have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them (don\'t forget to backup your data before doing that).<br /><br />After doing that, it\'s highly recommended to execute this utility again to check that no more wrong integers are found.';
-$string['yeswrongoraclesemanticsfound'] = 'Some Oracle columns using BYTE semantics have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them (don\'t forget to backup your data before doing that).<br /><br />After doing that, it\'s highly recommended to execute this utility again to check that no more wrong semantics are found.';
+$string['yesmissingindexesfound'] = '<p>Some missing indexes have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all of them. Remember to backup your data first!</p>
+<p>After doing that, it\'s highly recommended to execute this utility again to check that no more missing indexes are found.</p>';
+$string['yeswrongdefaultsfound'] = '<p>Some inconsistent defaults have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to fix them all. Remember to backup your data first!</p>
+<p>After doing that, it\'s highly recommended to execute this utility again to check that no more inconsistent defaults are found.</p>';
+$string['yeswrongintsfound'] = '<p>Some wrong integers have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them. Remember to backup your data first!</p>
+<p>After doing that, it\'s highly recommended to execute this utility again to check that no more wrong integers are found.</p>';
+$string['yeswrongoraclesemanticsfound'] = '<p>Some Oracle columns using BYTE semantics have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them. Remember to backup your data first!</p>
+<p>After doing that, it\'s highly recommended to execute this utility again to check that no more wrong semantics are found.</p>';
/// no guest autologin
require_login(0, false);
+if (isguestuser()) {
+ // Login as real user!
+ $SESSION->wantsurl = (string)new moodle_url('/admin/upgradesettings.php', array('return'=>$return));
+ redirect(get_login_url());
+}
admin_externalpage_setup('upgradesettings'); // now hidden page
$PAGE->set_pagelayout('maintenance'); // do not print any blocks or other rubbish, we want to force saving
if ($user->firstaccess == 0) {
$user->firstaccess = time();
}
- require_once($CFG->dirroot.'/user/lib.php');
user_update_user($user, false);
return AUTH_CONFIRM_OK;
}
/**
* Code the transformations to perform in the course in
* order to get transportable (encoded) links
+ * @param string $content content in which to encode links.
+ * @return string content with links encoded.
*/
static public function encode_content_links($content) {
- global $CFG;
-
- $base = preg_quote($CFG->wwwroot, '/');
// Link to the course main page (it also covers "&topic=xx" and "&week=xx"
- // because they don't become transformed (section number) in backup/restore
- $search = '/(' . $base . '\/course\/view.php\?id\=)([0-9]+)/';
- $content= preg_replace($search, '$@COURSEVIEWBYID*$2@$', $content);
+ // because they don't become transformed (section number) in backup/restore.
+ $content = self::encode_links_helper($content, 'COURSEVIEWBYID', '/course/view.php?id=');
+
+ // A few other key course links.
+ $content = self::encode_links_helper($content, 'GRADEINDEXBYID', '/grade/index.php?id=');
+ $content = self::encode_links_helper($content, 'GRADEREPORTINDEXBYID', '/grade/report/index.php?id=');
+ $content = self::encode_links_helper($content, 'BADGESVIEWBYID', '/badges/view.php?type=2&id=');
+ $content = self::encode_links_helper($content, 'USERINDEXVIEWBYID', '/user/index.php?id=');
return $content;
}
+ /**
+ * Helper method, used by encode_content_links.
+ * @param string $content content in which to encode links.
+ * @param unknown_type $name the name of this type of encoded link.
+ * @param unknown_type $path the path that identifies this type of link, up
+ * to the ?paramname= bit.
+ * @return string content with one type of link encoded.
+ */
+ static private function encode_links_helper($content, $name, $path) {
+ global $CFG;
+ $base = preg_quote($CFG->wwwroot . $path, '/');
+ return preg_replace('/(' . $base . ')([0-9]+)/', '$@' . $name . '*$2@$', $content);
+ }
+
// Protected API starts here
/**
$contents = array();
$contents[] = new restore_decode_content('course', 'summary');
+ $contents[] = new restore_decode_content('event', 'description');
return $contents;
}
static public function define_decode_rules() {
$rules = array();
- $rules[] = new restore_decode_rule('COURSEVIEWBYID', '/course/view.php?id=$1', 'course');
+ // Link to the course main page (it also covers "&topic=xx" and "&week=xx"
+ // because they don't become transformed (section number) in backup/restore.
+ $rules[] = new restore_decode_rule('COURSEVIEWBYID', '/course/view.php?id=$1', 'course');
- return $rules;
+ // A few other key course links.
+ $rules[] = new restore_decode_rule('GRADEINDEXBYID', '/grade/index.php?id=$1', 'course');
+ $rules[] = new restore_decode_rule('GRADEREPORTINDEXBYID', '/grade/report/index.php?id=$1', 'course');
+ $rules[] = new restore_decode_rule('BADGESVIEWBYID', '/badges/view.php?type=2&id=$1', 'course');
+ $rules[] = new restore_decode_rule('USERINDEXVIEWBYID', '/user/index.php?id=$1', 'course');
+ return $rules;
}
// Protected API starts here
$result = $DB->record_exists_sql($sql, $arg);
if (empty($result)) {
$newitemid = $DB->insert_record('event', $params);
+ $this->set_mapping('event', $oldid, $newitemid);
$this->set_mapping('event_description', $oldid, $newitemid, $restorefiles);
}
require_login($course, null, $cm);
require_capability('moodle/restore:restorecourse', $context);
+if (is_null($course)) {
+ $coursefullname = $SITE->fullname;
+ $courseshortname = $SITE->shortname;
+} else {
+ $coursefullname = $course->fullname;
+ $courseshortname = $course->shortname;
+}
+
// Show page header.
-$PAGE->set_title($course->shortname . ': ' . get_string('restore'));
-$PAGE->set_heading($course->fullname);
+$PAGE->set_title($courseshortname . ': ' . get_string('restore'));
+$PAGE->set_heading($coursefullname);
$renderer = $PAGE->get_renderer('core','backup');
echo $OUTPUT->header();
require_login($course, false, $cm);
require_capability('moodle/restore:restorecourse', $context);
+if (is_null($course)) {
+ $courseid = 0;
+ $coursefullname = $SITE->fullname;
+} else {
+ $courseid = $course->id;
+ $coursefullname = $course->fullname;
+}
+
$browser = get_file_browser();
// check if tmp dir exists
'pathnamehash' => $file->get_pathnamehash(), 'contenthash' => $file->get_contenthash()));
} else {
// If it's some weird other kind of file then use old code.
- $filename = restore_controller::get_tempdir_name($course->id, $USER->id);
+ $filename = restore_controller::get_tempdir_name($courseid, $USER->id);
$pathname = $tmpdir . '/' . $filename;
$fileinfo->copy_to_pathname($pathname);
$restore_url = new moodle_url('/backup/restore.php', array(
$PAGE->set_url($url);
$PAGE->set_context($context);
-$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
+$PAGE->set_title(get_string('course') . ': ' . $coursefullname);
$PAGE->set_heading($heading);
$PAGE->set_pagelayout('admin');
$form = new course_restore_form(null, array('contextid'=>$contextid));
$data = $form->get_data();
if ($data && has_capability('moodle/restore:uploadfile', $context)) {
- $filename = restore_controller::get_tempdir_name($course->id, $USER->id);
+ $filename = restore_controller::get_tempdir_name($courseid, $USER->id);
$pathname = $tmpdir . '/' . $filename;
$form->save_file('backupfile', $pathname);
$restore_url = new moodle_url('/backup/restore.php', array('contextid'=>$contextid, 'filename'=>$filename));
public static function decode_backup_temp_info($info) {
// We encode all data except null.
if ($info != null) {
- if (extension_loaded('zlib')) {
- return unserialize(gzuncompress(base64_decode($info)));
- } else {
- return unserialize(base64_decode($info));
- }
+ return unserialize(gzuncompress(base64_decode($info)));
}
return $info;
}
if ($info != null) {
// We compress if possible. It reduces db, network and memory storage. The saving is greater than CPU compression cost.
// Compression level 1 is chosen has it produces good compression with the smallest possible overhead, see MDL-40618.
- if (extension_loaded('zlib')) {
- return base64_encode(gzcompress(serialize($info), 1));
- } else {
- return base64_encode(serialize($info));
- }
+ return base64_encode(gzcompress(serialize($info), 1));
}
return $info;
}
--- /dev/null
+<?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/>.
+
+/**
+ * @package core_backup
+ * @category phpunit
+ * @copyright 2013 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+
+global $CFG;
+require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
+require_once($CFG->dirroot . '/backup/moodle2/backup_course_task.class.php');
+
+
+
+/**
+ * Tests for encoding content links in backup_course_task.
+ *
+ * The code that this tests is acutally in backup/moodle2/backup_course_task.class.php,
+ * but there is no place for unit tests near there, and perhaps one day it will
+ * be refactored so it becomes more generic.
+ */
+class backup_course_task_testcase extends basic_testcase {
+
+ /**
+ * Test the encode_content_links method for course.
+ */
+ public function test_course_encode_content_links() {
+ global $CFG;
+ $encoded = backup_course_task::encode_content_links(
+ $CFG->wwwroot . '/course/view.php?id=123, ' .
+ $CFG->wwwroot . '/grade/index.php?id=123, ' .
+ $CFG->wwwroot . '/grade/report/index.php?id=123, ' .
+ $CFG->wwwroot . '/badges/view.php?type=2&id=123 and ' .
+ $CFG->wwwroot . '/user/index.php?id=123.');
+ $this->assertEquals('$@COURSEVIEWBYID*123@$, $@GRADEINDEXBYID*123@$, ' .
+ '$@GRADEREPORTINDEXBYID*123@$, $@BADGESVIEWBYID*123@$ and $@USERINDEXVIEWBYID*123@$.', $encoded);
+ }
+}
$badgeid = required_param('id', PARAM_INT);
$copy = optional_param('copy', 0, PARAM_BOOL);
-$delete = optional_param('delete', 0, PARAM_BOOL);
$activate = optional_param('activate', 0, PARAM_BOOL);
$deactivate = optional_param('lock', 0, PARAM_BOOL);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
}
$returnurl->remove_params('awards');
-if ($delete) {
- require_capability('moodle/badges:deletebadge', $context);
-
- $PAGE->url->param('delete', 1);
- if ($confirm) {
- require_sesskey();
- $badge->delete();
- redirect(new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid)));
- }
-
- $strheading = get_string('delbadge', 'badges');
- $PAGE->navbar->add($strheading);
- $PAGE->set_title($strheading);
- $PAGE->set_heading($badge->name);
- echo $OUTPUT->header();
- echo $OUTPUT->heading($strheading);
-
- $urlparams = array(
- 'id' => $badge->id,
- 'delete' => 1,
- 'confirm' => 1,
- 'sesskey' => sesskey()
- );
- $continue = new moodle_url('/badges/action.php', $urlparams);
- $cancel = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
-
- $message = get_string('delconfirm', 'badges', $badge->name);
- echo $OUTPUT->confirm($message, $continue, $cancel);
- echo $OUTPUT->footer();
- die;
-}
-
if ($copy) {
require_sesskey();
require_capability('moodle/badges:createbadge', $context);
$pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
$issuerrole = new stdClass();
$issuerrole->roleid = $role;
- $roleselect = get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select, $role);
+ $roleselect = get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select, $role, null);
}
} else {
echo $OUTPUT->header();
$type = required_param('type', PARAM_INT);
$courseid = optional_param('id', 0, PARAM_INT);
$page = optional_param('page', 0, PARAM_INT);
-$activate = optional_param('activate', 0, PARAM_INT);
$deactivate = optional_param('lock', 0, PARAM_INT);
$sortby = optional_param('sort', 'name', PARAM_ALPHA);
$sorthow = optional_param('dir', 'ASC', PARAM_ALPHA);
$confirm = optional_param('confirm', false, PARAM_BOOL);
$delete = optional_param('delete', 0, PARAM_INT);
+$archive = optional_param('archive', 0, PARAM_INT);
$msg = optional_param('msg', '', PARAM_TEXT);
if (!in_array($sortby, array('name', 'status'))) {
$PAGE->requires->js_init_call('check_site_access', null, false);
$output = $PAGE->get_renderer('core', 'badges');
-if ($delete && has_capability('moodle/badges:deletebadge', $PAGE->context)) {
- $badge = new badge($delete);
+if (($delete || $archive) && has_capability('moodle/badges:deletebadge', $PAGE->context)) {
+ $badgeid = ($archive != 0) ? $archive : $delete;
+ $badge = new badge($badgeid);
if (!$confirm) {
echo $output->header();
- echo $output->confirm(
- get_string('delconfirm', 'badges', $badge->name),
- new moodle_url($PAGE->url, array('delete' => $badge->id, 'confirm' => 1)),
- $returnurl
- );
+ // Archive this badge?
+ echo $output->heading(get_string('archivebadge', 'badges', $badge->name));
+ $archivebutton = $output->single_button(
+ new moodle_url($PAGE->url, array('archive' => $badge->id, 'confirm' => 1)),
+ get_string('archiveconfirm', 'badges'));
+ echo $output->box(get_string('archivehelp', 'badges') . $archivebutton, 'generalbox');
+
+ // Delete this badge?
+ echo $output->heading(get_string('delbadge', 'badges', $badge->name));
+ $deletebutton = $output->single_button(
+ new moodle_url($PAGE->url, array('delete' => $badge->id, 'confirm' => 1)),
+ get_string('delconfirm', 'badges'));
+ echo $output->box(get_string('deletehelp', 'badges') . $deletebutton, 'generalbox');
+
+ // Go back.
+ echo $output->action_link($returnurl, get_string('cancel'));
+
echo $output->footer();
die();
} else {
require_sesskey();
- $badge->delete();
+ $archiveonly = ($archive != 0) ? true : false;
+ $badge->delete($archiveonly);
redirect($returnurl);
}
}
in all criteria classes. This method returns an array consisting of SQL JOIN statement, WHERE conditions,
and any parameters that might be required. The results are used in lib/badgeslib.php in review_all_criteria()
to reduce to the minimum the number of users to review and award badges.
-
* New optional parameter $filtered in review() allows to indicate that some expensive checks can be skipped
if the list of users has been initially filtered based on met criteria.
+* New optional parameter $archive in delete() in badge class in badgeslib.php
+ allows to indicate that a badge should be archived instead of fully deleted.
+ If this parameter is set to FALSE, a badge will all its information, criteria,
+ and awards will be removed from the database.
And I expand "Activity modules" node
And I follow "Manage activities"
And I click on "//a[@title=\"Show\"]" "xpath_element" in the "Feedback" "table_row"
- And I click on "//a[@title=\"Show\"]" "xpath_element" in the "Assignment (2.2)" "table_row"
Scenario: Add activities block on the frontpage
And the following "activities" exists:
| activity | name | intro | course | idnumber |
| assign | Frontpage assignment name | Frontpage assignment description | Acceptance test site | assign0 |
- | assignment | Frontpage assignment22 name | Frontpage assignment22 description | Acceptance test site | assignment0 |
| book | Frontpage book name | Frontpage book description | Acceptance test site | book0 |
| chat | Frontpage chat name | Frontpage chat description | Acceptance test site | chat0 |
| choice | Frontpage choice name | Frontpage choice description | Acceptance test site | choice0 |
And I click on "Assignments" "link" in the "Activities" "block"
Then I should see "Frontpage assignment name"
And I am on homepage
- And I click on "Assignments (2.2)" "link" in the "Activities" "block"
- And I should see "Frontpage assignment22 name"
- And I am on homepage
And I click on "Chats" "link" in the "Activities" "block"
And I should see "Frontpage chat name"
And I am on homepage
And the following "activities" exists:
| activity | name | intro | course | idnumber |
| assign | Test assignment name | Test assignment description | C1 | assign1 |
- | assignment | Test assignment22 name | Test assignment22 description | C1 | assignment1 |
| book | Test book name | Test book description | C1 | book1 |
| chat | Test chat name | Test chat description | C1 | chat1 |
| choice | Test choice name | Test choice description | C1 | choice1 |
And I click on "Assignments" "link" in the "Activities" "block"
Then I should see "Test assignment name"
And I follow "Course 1"
- And I click on "Assignments (2.2)" "link" in the "Activities" "block"
- And I should see "Test assignment22 name"
- And I follow "Course 1"
And I click on "Chats" "link" in the "Activities" "block"
And I should see "Test chat name"
And I follow "Course 1"
$this->content->footer = '';
$this->page->settingsnav->initialise();
- $node = $this->page->settingsnav->get('root', navigation_node::TYPE_SETTING);
+ $node = $this->page->settingsnav->get('root', navigation_node::TYPE_SITE_ADMIN);
if (!$node || !$node->contains_active_node()) {
return $this->content;
}
--- /dev/null
+<?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/>.
+
+/**
+ * block_comments comment created event.
+ *
+ * @package block_comments
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace block_comments\event;
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * block_comments comment created event.
+ *
+ * @package block_comments
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class comment_created extends \core\event\comment_created {
+ // No need to override any method.
+}
--- /dev/null
+<?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/>.
+
+/**
+ * block_comments comment deleted event.
+ *
+ * @package block_comments
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace block_comments\event;
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * block_comments comment deleted event.
+ *
+ * @package block_comments
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class comment_deleted extends \core\event\comment_deleted {
+ // No need to override any method.
+}
--- /dev/null
+<?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/>.
+
+/**
+ * Events tests.
+ *
+ * @package block_comments
+ * @category test
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Events tests class.
+ *
+ * @package block_comments
+ * @category test
+ * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_comments_events_testcase extends advanced_testcase {
+ /** @var stdClass Keeps course object */
+ private $course;
+
+ /** @var stdClass Keeps wiki object */
+ private $wiki;
+
+ /**
+ * Setup test data.
+ */
+ public function setUp() {
+ $this->resetAfterTest();
+ $this->setAdminUser();
+
+ // Create course and wiki.
+ $this->course = $this->getDataGenerator()->create_course();
+ $this->wiki = $this->getDataGenerator()->create_module('wiki', array('course' => $this->course->id));
+ }
+
+ /**
+ * Test comment_created event.
+ */
+ public function test_comment_created() {
+ global $CFG;
+
+ require_once($CFG->dirroot . '/comment/lib.php');
+
+ // Comment on course page.
+ $context = context_course::instance($this->course->id);
+ $args = new stdClass;
+ $args->context = $context;
+ $args->course = $this->course;
+ $args->area = 'page_comments';
+ $args->itemid = 0;
+ $args->component = 'block_comments';
+ $args->linktext = get_string('showcomments');
+ $args->notoggle = true;
+ $args->autostart = true;
+ $args->displaycancel = false;
+ $comment = new comment($args);
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $comment->add('New comment');
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\block_comments\event\comment_created', $event);
+ $this->assertEquals($context, $event->get_context());
+ $url = new moodle_url('/course/view.php', array('id' => $this->course->id));
+ $this->assertEquals($url, $event->get_url());
+
+ // Comments when block is on module (wiki) page.
+ $context = context_module::instance($this->wiki->id);
+ $args = new stdClass;
+ $args->context = $context;
+ $args->course = $this->course;
+ $args->area = 'page_comments';
+ $args->itemid = 0;
+ $args->component = 'block_comments';
+ $args->linktext = get_string('showcomments');
+ $args->notoggle = true;
+ $args->autostart = true;
+ $args->displaycancel = false;
+ $comment = new comment($args);
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $comment->add('New comment 1');
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\block_comments\event\comment_created', $event);
+ $this->assertEquals($context, $event->get_context());
+ $url = new moodle_url('/mod/wiki/view.php', array('id' => $this->wiki->id));
+ $this->assertEquals($url, $event->get_url());
+ }
+
+ /**
+ * Test comment_deleted event.
+ */
+ public function test_comment_deleted() {
+ global $CFG;
+
+ require_once($CFG->dirroot . '/comment/lib.php');
+
+ // Comment on course page.
+ $context = context_course::instance($this->course->id);
+ $args = new stdClass;
+ $args->context = $context;
+ $args->course = $this->course;
+ $args->area = 'page_comments';
+ $args->itemid = 0;
+ $args->component = 'block_comments';
+ $args->linktext = get_string('showcomments');
+ $args->notoggle = true;
+ $args->autostart = true;
+ $args->displaycancel = false;
+ $comment = new comment($args);
+ $newcomment = $comment->add('New comment');
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $comment->delete($newcomment->id);
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\block_comments\event\comment_deleted', $event);
+ $this->assertEquals($context, $event->get_context());
+ $url = new moodle_url('/course/view.php', array('id' => $this->course->id));
+ $this->assertEquals($url, $event->get_url());
+
+ // Comments when block is on module (wiki) page.
+ $context = context_module::instance($this->wiki->id);
+ $args = new stdClass;
+ $args->context = $context;
+ $args->course = $this->course;
+ $args->area = 'page_comments';
+ $args->itemid = 0;
+ $args->component = 'block_comments';
+ $args->linktext = get_string('showcomments');
+ $args->notoggle = true;
+ $args->autostart = true;
+ $args->displaycancel = false;
+ $comment = new comment($args);
+ $newcomment = $comment->add('New comment 1');
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $comment->delete($newcomment->id);
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\block_comments\event\comment_deleted', $event);
+ $this->assertEquals($context, $event->get_context());
+ $url = new moodle_url('/mod/wiki/view.php', array('id' => $this->wiki->id));
+ $this->assertEquals($url, $event->get_url());
+ }
+}
--- /dev/null
+/* Rule so that the table tree view works with word-wrap: break-word. */
+.block_private_files .content table {
+ table-layout: fixed;
+ width: 100%;
+}
\ No newline at end of file
break;
case 'add mod':
$text = get_string('added', 'moodle', $cm->modfullname). '<br />'.
- html_writer::link($cm->get_url(), format_string($cm->name, true));
+ html_writer::link($cm->url, format_string($cm->name, true));
break;
case 'update mod':
$text = get_string('updated', 'moodle', $cm->modfullname). '<br />'.
- html_writer::link($cm->get_url(), format_string($cm->name, true));
+ html_writer::link($cm->url, format_string($cm->name, true));
break;
default:
return '';
$string['enabledock'] = 'Allow the user to dock this block';
$string['pluginname'] = 'Administration';
$string['settings:addinstance'] = 'Add a new administration block';
-$string['settings:myaddinstance'] = 'Add a new settings block to My home';
+$string['settings:myaddinstance'] = 'Add a new administration block to My home';
$content = $cm->get_formatted_content(array('overflowdiv' => true, 'noclean' => true));
$instancename = $cm->get_formatted_name();
- if (!($url = $cm->get_url())) {
+ if (!($url = $cm->url)) {
$this->content->items[] = $content;
$this->content->icons[] = '';
} else {
$instancename = $mod->get_formatted_name();
$linkcss = $mod->visible ? '' : ' class="dimmed" ';
- if (!($url = $mod->get_url())) {
+ if (!($url = $mod->url)) {
$this->content->items[] = $content . $editbuttons;
$this->content->icons[] = '';
} else {
$content = $cm->get_formatted_content(array('overflowdiv' => true, 'noclean' => true));
$instancename = $cm->get_formatted_name();
- if (!($url = $cm->get_url())) {
+ if (!($url = $cm->url)) {
$this->content->items[] = $content;
$this->content->icons[] = '';
} else {
$linkcss = $mod->visible ? '' : ' class="dimmed" ';
- if (!($url = $mod->get_url())) {
+ if (!($url = $mod->url)) {
$this->content->items[] = $content . $editbuttons;
$this->content->icons[] = '';
} else {
public function test_blog_entries_viewed_event() {
$this->setAdminUser();
- $this->resetAfterTest();
+
$other = array('entryid' => $this->postid, 'tagid' => $this->tagid, 'userid' => $this->userid, 'modid' => $this->cmid,
'groupid' => $this->groupid, 'courseid' => $this->courseid, 'search' => 'search', 'fromstart' => 2);
$arr = array(SITEID, 'blog', 'view', $url2->out(), 'view blog entry');
$this->assertEventLegacyLogData($arr, $event);
}
+
+ /**
+ * Test comment_created event.
+ */
+ public function test_blog_comment_created_event() {
+ global $USER, $CFG;
+
+ $this->setAdminUser();
+
+ require_once($CFG->dirroot . '/comment/lib.php');
+ $context = context_user::instance($USER->id);
+
+ $cmt = new stdClass();
+ $cmt->context = $context;
+ $cmt->courseid = $this->courseid;
+ $cmt->area = 'format_blog';
+ $cmt->itemid = $this->postid;
+ $cmt->showcount = 1;
+ $cmt->component = 'blog';
+ $manager = new comment($cmt);
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $manager->add("New comment");
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\core\event\blog_comment_created', $event);
+ $this->assertEquals($context, $event->get_context());
+ $this->assertEquals($this->postid, $event->other['itemid']);
+ $url = new moodle_url('/blog/index.php', array('entryid' => $this->postid));
+ $this->assertEquals($url, $event->get_url());
+ }
+
+ /**
+ * Test comment_deleted event.
+ */
+ public function test_blog_comment_deleted_event() {
+ global $USER, $CFG;
+
+ $this->setAdminUser();
+
+ require_once($CFG->dirroot . '/comment/lib.php');
+ $context = context_user::instance($USER->id);
+
+ $cmt = new stdClass();
+ $cmt->context = $context;
+ $cmt->courseid = $this->courseid;
+ $cmt->area = 'format_blog';
+ $cmt->itemid = $this->postid;
+ $cmt->showcount = 1;
+ $cmt->component = 'blog';
+ $manager = new comment($cmt);
+ $newcomment = $manager->add("New comment");
+
+ // Triggering and capturing the event.
+ $sink = $this->redirectEvents();
+ $manager->delete($newcomment->id);
+ $events = $sink->get_events();
+ $this->assertCount(1, $events);
+ $event = reset($events);
+
+ // Checking that the event contains the expected values.
+ $this->assertInstanceOf('\core\event\blog_comment_deleted', $event);
+ $this->assertEquals($context, $event->get_context());
+ $this->assertEquals($this->postid, $event->other['itemid']);
+ $url = new moodle_url('/blog/index.php', array('entryid' => $this->postid));
+ $this->assertEquals($url, $event->get_url());
+ }
}
return (!empty($this->definition));
}
- /**
- * Returns true if this is ready.
- * @return bool
- */
- public function is_ready() {
- return true;
- }
-
/**
* Returns true the given mode is supported.
* @param int $mode
public function create_cache(cache_definition $definition) {
$class = $definition->get_cache_class();
$stores = cache_helper::get_stores_suitable_for_definition($definition);
+ foreach ($stores as $key => $store) {
+ if (!$store::are_requirements_met()) {
+ unset($stores[$key]);
+ }
+ }
if (count($stores) === 0) {
// Hmm still no stores, better provide a dummy store to mimic functionality. The dev will be none the wiser.
$stores[] = $this->create_dummy_store($definition);
/**
* Creates a store instance given its name and configuration.
*
- * If the store has already been instantiated then the original objetc will be returned. (reused)
+ * If the store has already been instantiated then the original object will be returned. (reused)
*
* @param string $name The name of the store (must be unique remember)
* @param array $details
$store = new $class($details['name'], $details['configuration']);
$this->stores[$name] = $store;
}
+ /* @var cache_store $store */
$store = $this->stores[$name];
- if (!$store->is_ready() || !$store->is_supported_mode($definition->get_mode())) {
+ // We check are_requirements_met although we expect is_ready is going to check as well.
+ if (!$store::are_requirements_met() || !$store->is_ready() || !$store->is_supported_mode($definition->get_mode())) {
return false;
}
// We always create a clone of the original store.
$class = $store['class'];
// Found the store: is it ready?
+ /* @var cache_store $instance */
$instance = new $class($store['name'], $store['configuration']);
- if (!$instance->is_ready()) {
+ // We check are_requirements_met although we expect is_ready is going to check as well.
+ if (!$instance::are_requirements_met() || !$instance->is_ready()) {
unset($instance);
return false;
}
* Returns true if this cache store instance is ready to use.
* @return bool
*/
- abstract public function is_ready();
+ public function is_ready() {
+ return forward_static_call(array($this, 'are_requirements_met'));
+ }
/**
* Retrieves an item from the cache store given its key.
return (is_array($this->store));
}
- /**
- * Returns true if this store instance is ready to be used.
- * @return bool
- */
- public function is_ready() {
- return true;
- }
-
/**
* Retrieves an item from the cache store given its key.
*
return (is_array($this->store));
}
- /**
- * Returns true if this store instance is ready to be used.
- * @return bool
- */
- public function is_ready() {
- return true;
- }
-
/**
* Retrieves an item from the cache store given its key.
*
This files describes API changes in /cache/stores/* - cache store plugins.
Information provided here is intended especially for developers.
+=== 2.7 ===
+* cache_store::is_ready is no longer abstract, calling cache_store::are_requirements_met by default.
+
=== 2.6 ===
* All cache instances are recorded and subsequent requests are given a reference to the original instance.
* The persistent option for the cache definition has been deprecated. Please use the staticacceleration option instead.
continue;
}
}
- if ($event->modulename == 'assignment'){
- // create calendar_event to test edit_event capability
- // this new event will also prevent double creation of calendar_event object
- $checkevent = new calendar_event($event);
- // TODO: rewrite this hack somehow
- if (!calendar_edit_event_allowed($checkevent)){ // cannot manage entries, eg. student
- if (!$assignment = $DB->get_record('assignment', array('id'=>$event->instance))) {
- // print_error("invalidid", 'assignment');
- continue;
- }
- // assign assignment to assignment object to use hidden_is_hidden method
- require_once($CFG->dirroot.'/mod/assignment/lib.php');
-
- if (!file_exists($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php')) {
- continue;
- }
- require_once ($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php');
-
- $assignmentclass = 'assignment_'.$assignment->assignmenttype;
- $assignmentinstance = new $assignmentclass($cm->id, $assignment, $cm);
-
- if ($assignmentinstance->description_is_hidden()){//force not to show description before availability
- $event->description = get_string('notavailableyet', 'assignment');
- }
- }
- }
}
if ($processed >= $display->maxevents) {
return $output;
}
- /**
- * Displays a filter selection table
- *
- * @param calendar_information $calendar
- * @return string
- * @deprecated since Moodle 2.4 MDL-32309
- * @see calendar_filter_controls()
- */
- protected function filter_selection_table(calendar_information $calendar, moodle_url $returnurl = null) {
- global $SESSION;
- debugging('Method core_calendar_renderer::filter_selection_table() is deprecated, please use '.
- 'calendar_filter_controls() instead', DEBUG_DEVELOPER);
-
- if ($returnurl === null) {
- $returnurl = $this->page->url;
- }
-
- $output = html_writer::start_tag('div', array('class'=>'filters'));
- $output .= html_writer::start_tag('table');
- $output .= html_writer::start_tag('tr');
-
- // Global events
- $link = new moodle_url(CALENDAR_URL.'set.php', array('var' => 'showglobal', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey()));
- $strglobalevents = get_string('globalevents', 'calendar');
- if (calendar_show_event_type(CALENDAR_EVENT_GLOBAL)) {
- $output .= html_writer::tag('td', '', array('class'=>'calendar_event_global', 'style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strglobalevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').'<span class="accesshide">'.$strglobalevents.'</span>').')');
- } else {
- $output .= html_writer::tag('td', '', array('style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strglobalevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').'<span class="accesshide">'.$strglobalevents.'</span>').')');
- }
-
- // Course events
- $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showcourses', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey()));
- $strcourseevents = get_string('courseevents', 'calendar');
- if (calendar_show_event_type(CALENDAR_EVENT_COURSE)) {
- $output .= html_writer::tag('td', '', array('class'=>'calendar_event_course', 'style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strcourseevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').'<span class="accesshide">'.$strcourseevents.'</span>').')');
- } else {
- $output .= html_writer::tag('td', '', array('style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strcourseevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').'<span class="accesshide">'.$strcourseevents.'</span>').')');
- }
- $output .= html_writer::end_tag('tr');
-
- if(isloggedin() && !isguestuser()) {
- $output .= html_writer::start_tag('tr');
- // Group events
- $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showgroups', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey()));
- $strgroupevents = get_string('groupevents', 'calendar');
- if (calendar_show_event_type(CALENDAR_EVENT_GROUP)) {
- $output .= html_writer::tag('td', '', array('class'=>'calendar_event_group', 'style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strgroupevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').'<span class="accesshide">'.$strgroupevents.'</span>').')');
- } else {
- $output .= html_writer::tag('td', '', array('style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $strgroupevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').'<span class="accesshide">'.$strgroupevents.'</span>').')');
- }
- // User events
- $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showuser', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey()));
- $struserevents = get_string('userevents', 'calendar');
- if (calendar_show_event_type(CALENDAR_EVENT_USER)) {
- $output .= html_writer::tag('td', '', array('class'=>'calendar_event_user', 'style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $struserevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').'<span class="accesshide">'.$struserevents.'</span>').')');
- } else {
- $output .= html_writer::tag('td', '', array('style'=>'width:8px;'));
- $output .= html_writer::tag('td', html_writer::tag('strong', $struserevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').'<span class="accesshide">'.$struserevents.'</span>').')');
- }
- $output .= html_writer::end_tag('tr');
- }
- $output .= html_writer::end_tag('table');
- $output .= html_writer::end_tag('div');
- return $output;
- }
-
/**
* Displays upcoming events
*
$html .= html_writer::end_tag('form');
return $html;
}
-}
\ No newline at end of file
+}
$newcmt->time = userdate($newcmt->timecreated, $newcmt->strftimeformat);
// Trigger comment created event.
- $eventclassname = '\\' . $this->component . '\\event\comment_created';
+ if (core_component::is_core_subsystem($this->component)) {
+ $eventclassname = '\\core\\event\\' . $this->component . '_comment_created';
+ } else {
+ $eventclassname = '\\' . $this->component . '\\event\comment_created';
+ }
if (class_exists($eventclassname)) {
$event = $eventclassname::create(
array(
}
$DB->delete_records('comments', array('id'=>$commentid));
// Trigger comment delete event.
- $eventclassname = '\\' . $this->component . '\\event\comment_deleted';
+ if (core_component::is_core_subsystem($this->component)) {
+ $eventclassname = '\\core\\event\\' . $this->component . '_comment_deleted';
+ } else {
+ $eventclassname = '\\' . $this->component . '\\event\comment_deleted';
+ }
if (class_exists($eventclassname)) {
$event = $eventclassname::create(
array(
"require-dev": {
"phpunit/phpunit": "3.7.*",
"phpunit/dbUnit": "1.2.*",
- "moodlehq/behat-extension": "1.27.0"
+ "moodlehq/behat-extension": "1.27.3"
}
}
//=========================================================================
// 10. SECRET PASSWORD SALT
//=========================================================================
-// A single site-wide password salt is no longer required *unless* you are
-// upgrading an older version of Moodle (prior to 2.5), or if you are using
-// a PHP version below 5.3.7. If upgrading, keep any values from your old
-// config.php file. If you are using PHP < 5.3.7 set to a long random string
-// below:
+// A site-wide password salt is no longer used in new installations.
+// If upgrading from 2.6 or older, keep all existing salts in config.php file.
//
// $CFG->passwordsaltmain = 'a_very_long_random_string_of_characters#@6&*1';
//
);
}
+ if ($category->can_restore_courses_into()) {
+ $actions['restore'] = array(
+ 'url' => new \moodle_url('/backup/restorefile.php', array('contextid' => $category->get_context()->id)),
+ 'icon' => new \pix_icon('i/restore', new \lang_string('restorecourse', 'admin')),
+ 'string' => new \lang_string('restorecourse', 'admin')
+ );
+ }
+
return $actions;
}
var result = JSON.parse(xhr.responseText);
if (result) {
if (result.error == 0) {
- // All OK - update the dummy element
- if (result.content) {
- // A label
- resel.indentdiv.innerHTML = '<div class="activityinstance" ></div>' + result.content + result.commands;
- } else {
- // Not a label
- resel.icon.src = result.icon;
- resel.a.href = result.link;
- resel.namespan.innerHTML = result.name;
-
- if (!parseInt(result.visible, 10)) {
- resel.a.className = 'dimmed';
- }
-
- if (result.groupingname) {
- resel.groupingspan.innerHTML = '(' + result.groupingname + ')';
- } else {
- resel.div.removeChild(resel.groupingspan);
- }
-
- resel.div.removeChild(resel.progressouter);
- resel.indentdiv.innerHTML += result.commands;
- if (result.onclick) {
- resel.a.onclick = result.onclick;
- }
- if (self.Y.UA.gecko > 0) {
- // Fix a Firefox bug which makes sites with a '~' in their wwwroot
- // log the user out when clicking on the link (before refreshing the page).
- resel.div.innerHTML = unescape(resel.div.innerHTML);
- }
+ // All OK - replace the dummy element.
+ resel.li.outerHTML = result.fullcontent;
+ if (self.Y.UA.gecko > 0) {
+ // Fix a Firefox bug which makes sites with a '~' in their wwwroot
+ // log the user out when clicking on the link (before refreshing the page).
+ resel.li.outerHTML = unescape(resel.li.outerHTML);
}
- resel.li.id = result.elementid;
self.add_editing(result.elementid);
} else {
// Error - remove the dummy element
var result = JSON.parse(xhr.responseText);
if (result) {
if (result.error == 0) {
- // All OK - update the dummy element
- if (result.content) {
- // A label
- resel.indentdiv.innerHTML = '<div class="activityinstance" ></div>' + result.content + result.commands;
- } else {
- // Not a label
- resel.icon.src = result.icon;
- resel.a.href = result.link;
- resel.namespan.innerHTML = result.name;
-
- if (!parseInt(result.visible, 10)) {
- resel.a.className = 'dimmed';
- }
-
- if (result.groupingname) {
- resel.groupingspan.innerHTML = '(' + result.groupingname + ')';
- } else {
- resel.div.removeChild(resel.groupingspan);
- }
-
- resel.div.removeChild(resel.progressouter);
- resel.div.innerHTML += result.commands;
- if (result.onclick) {
- resel.a.onclick = result.onclick;
- }
- if (self.Y.UA.gecko > 0) {
- // Fix a Firefox bug which makes sites with a '~' in their wwwroot
- // log the user out when clicking on the link (before refreshing the page).
- resel.div.innerHTML = unescape(resel.div.innerHTML);
- }
+ // All OK - replace the dummy element.
+ resel.li.outerHTML = result.fullcontent;
+ if (self.Y.UA.gecko > 0) {
+ // Fix a Firefox bug which makes sites with a '~' in their wwwroot
+ // log the user out when clicking on the link (before refreshing the page).
+ resel.li.outerHTML = unescape(resel.li.outerHTML);
}
- resel.li.id = result.elementid;
- self.add_editing(result.elementid, sectionnumber);
+ self.add_editing(result.elementid);
} else {
// Error - remove the dummy element
resel.parent.removeChild(resel.li);
*/
protected function send_response($mod) {
global $OUTPUT, $PAGE;
- $courserenderer = $PAGE->get_renderer('core', 'course');
$resp = new stdClass();
$resp->error = self::ERROR_OK;
- $resp->icon = $mod->get_icon_url()->out();
- $resp->name = $mod->name;
- if ($mod->has_view()) {
- $resp->link = $mod->get_url()->out();
- } else {
- $resp->link = null;
- }
- $resp->content = $mod->get_content();
- $resp->elementid = 'module-'.$mod->id;
- $actions = course_get_cm_edit_actions($mod, 0, $mod->sectionnum);
- $resp->commands = ' '. $courserenderer->course_section_cm_edit_actions($actions, $mod);
- $resp->onclick = $mod->get_on_click();
- $resp->visible = $mod->visible;
-
- // If using groupings, then display grouping name.
- if (!empty($mod->groupingid) && has_capability('moodle/course:managegroups', $this->context)) {
- $groupings = groups_get_all_groupings($this->course->id);
- $resp->groupingname = format_string($groupings[$mod->groupingid]->name);
- }
+ $resp->elementid = 'module-' . $mod->id;
+
+ $courserenderer = $PAGE->get_renderer('core', 'course');
+ $completioninfo = new completion_info($this->course);
+ $info = get_fast_modinfo($this->course);
+ $sr = null;
+ $modulehtml = $courserenderer->course_section_cm($this->course, $completioninfo,
+ $mod, null, array());
+ $resp->fullcontent = $courserenderer->course_section_cm_list_item($this->course, $completioninfo, $mod, $sr);
echo $OUTPUT->header();
echo json_encode($resp);
$modcontext = context_module::instance($cm->id);
if (!empty($cm->showdescription) or $cm->modname == 'label') {
- // We want to use the external format. However from reading get_formatted_content(), get_content() format is always FORMAT_HTML.
- list($module['description'], $descriptionformat) = external_format_text($cm->get_content(),
+ // We want to use the external format. However from reading get_formatted_content(), $cm->content format is always FORMAT_HTML.
+ list($module['description'], $descriptionformat) = external_format_text($cm->content,
FORMAT_HTML, $modcontext->id, $cm->modname, 'intro', $cm->id);
}
//url of the module
- $url = $cm->get_url();
+ $url = $cm->url;
if ($url) { //labels don't have url
- $module['url'] = $cm->get_url()->out(false);
+ $module['url'] = $url->out(false);
}
$canviewhidden = has_capability('moodle/course:viewhiddenactivities',
$options->overflowdiv = true;
return format_text($summarytext, $section->summaryformat, $options);
}
-
- /**
- * Is the section passed in the current section?
- *
- * @deprecated since 2.4
- * @see format_base::is_section_current()
- *
- * @param stdClass $course The course entry from DB
- * @param stdClass $section The course_section entry from the DB
- * @return bool true if the section is current
- */
- protected final function is_section_current($section, $course) {
- debugging('Function format_section_renderer_base::is_section_current() is deprecated. '.
- 'Use course_get_format($course)->is_section_current($section) instead', DEBUG_DEVELOPER);
- return course_get_format($course)->is_section_current($section);
- }
}
if (!$cm->uservisible) {
return null;
}
- $action = $cm->get_url();
+ $action = $cm->url;
if (!$action) {
// Do not add to navigation activity without url (i.e. labels).
return null;
// Student views an empty course page.
return;
}
- } else if (!$cm->uservisible || !$cm->get_url()) {
+ } else if (!$cm->uservisible || !$cm->url) {
// Activity is set but not visible to current user or does not have url.
// Display course page (either empty or with availability restriction info).
return;
} else {
// Everything is set up and accessible, redirect to the activity page!
- redirect($cm->get_url());
+ redirect($cm->url);
}
}
}
);
// Include course dragdrop
- if ($course->id != $SITE->id) {
+ if (course_format_uses_sections($course->format)) {
$PAGE->requires->yui_module('moodle-course-dragdrop', 'M.course.init_section_dragdrop',
array(array(
'courseid' => $course->id,
'emptydragdropregion'
), 'moodle');
- // Include format-specific strings
- if ($course->id != $SITE->id) {
+ // Include section-specific strings for formats which support sections.
+ if (course_format_uses_sections($course->format)) {
$PAGE->requires->strings_for_js(array(
'showfromothers',
'hidefromothers',
print_error('usernotincourse');
}
$context = $coursecontext;
+
+ // Check if course has SEPARATEGROUPS and user is part of that group.
+ if (groups_get_course_groupmode($course) == SEPARATEGROUPS &&
+ !has_capability('moodle/site:accessallgroups', $context)) {
+ $samegroup = false;
+ if ($groups = groups_get_all_groups($course->id, $USER->id)) {
+ foreach ($groups as $group) {
+ if (groups_is_member($group->id, $userid)) {
+ $samegroup = true;
+ break;
+ }
+ }
+ }
+ if (!$samegroup) {
+ print_error('nologinas');
+ }
+ }
}
// Login as this user and return to course home page.
$formcontent .= html_writer::start_tag('div', array('id' => 'typeformdiv'));
$formcontent .= html_writer::tag('input', '', array('type' => 'hidden', 'id' => 'course',
'name' => 'course', 'value' => $course->id));
- $formcontent .= html_writer::tag('input', '',
- array('type' => 'hidden', 'class' => 'jump', 'name' => 'jump', 'value' => ''));
$formcontent .= html_writer::tag('input', '', array('type' => 'hidden', 'name' => 'sesskey',
'value' => sesskey()));
$formcontent .= html_writer::end_tag('div');
// nothing to be displayed to the user
return $output;
}
- $url = $mod->get_url();
+ $url = $mod->url;
if (!$url) {
return $output;
}
// Get on-click attribute value if specified and decode the onclick - it
// has already been encoded for display (puke).
- $onclick = htmlspecialchars_decode($mod->get_on_click(), ENT_QUOTES);
+ $onclick = htmlspecialchars_decode($mod->onclick, ENT_QUOTES);
$groupinglabel = '';
if (!empty($mod->groupingid) && has_capability('moodle/course:managegroups', context_course::instance($mod->course))) {
} else {
$textclasses .= ' dimmed_text';
}
- if ($mod->get_url()) {
+ if ($mod->url) {
if ($content) {
// If specified, display extra content after link.
$output = html_writer::tag('div', $content, array('class' =>
public function course_section_cm_list_item($course, &$completioninfo, cm_info $mod, $sectionreturn, $displayoptions = array()) {
$output = '';
if ($modulehtml = $this->course_section_cm($course, $completioninfo, $mod, $sectionreturn, $displayoptions)) {
- $modclasses = 'activity ' . $mod->modname . ' modtype_' . $mod->modname . ' ' . $mod->get_extra_classes();
+ $modclasses = 'activity ' . $mod->modname . ' modtype_' . $mod->modname . ' ' . $mod->extraclasses;
$output .= html_writer::tag('li', $modulehtml, array('class' => $modclasses, 'id' => 'module-' . $mod->id));
}
return $output;
*
* This function calls:
* {@link core_course_renderer::course_section_cm_name()}
- * {@link cm_info::get_after_link()}
* {@link core_course_renderer::course_section_cm_text()}
* {@link core_course_renderer::course_section_cm_availability()}
* {@link core_course_renderer::course_section_cm_completion()}
}
// Module can put text after the link (e.g. forum unread)
- $output .= $mod->get_after_link();
+ $output .= $mod->afterlink;
// Closing the tag which contains everything but edit icons. Content part of the module should not be part of this.
$output .= html_writer::end_tag('div'); // .activityinstance
// it should work similarly (at least in terms of ordering) to an
// activity.
$contentpart = $this->course_section_cm_text($mod, $displayoptions);
- $url = $mod->get_url();
+ $url = $mod->url;
if (empty($url)) {
$output .= $contentpart;
}
if ($this->page->user_is_editing()) {
$editactions = course_get_cm_edit_actions($mod, $mod->indent, $sectionreturn);
$modicons .= ' '. $this->course_section_cm_edit_actions($editactions, $mod, $displayoptions);
- $modicons .= $mod->get_after_edit_icons();
+ $modicons .= $mod->afterediticons;
}
$modicons .= $this->course_section_cm_completion($course, $completioninfo, $mod, $displayoptions);
foreach($firstsection['modules'] as $module) {
if ($module['id'] == $forumcm->id and $module['modname'] == 'forum') {
$cm = $modinfo->cms[$forumcm->id];
- $formattedtext = format_text($cm->get_content(), FORMAT_HTML,
+ $formattedtext = format_text($cm->content, FORMAT_HTML,
array('noclean' => true, 'para' => false, 'filter' => false));
$this->assertEquals($formattedtext, $module['description']);
$testexecuted = $testexecuted + 1;
} else if ($module['id'] == $labelcm->id and $module['modname'] == 'label') {
$cm = $modinfo->cms[$labelcm->id];
- $formattedtext = format_text($cm->get_content(), FORMAT_HTML,
+ $formattedtext = format_text($cm->content, FORMAT_HTML,
array('noclean' => true, 'para' => false, 'filter' => false));
$this->assertEquals($formattedtext, $module['description']);
$testexecuted = $testexecuted + 1;
$record = new stdClass();
$record->course = $course->id;
$module1 = self::getDataGenerator()->create_module('forum', $record);
- $module2 = self::getDataGenerator()->create_module('assignment', $record);
+ $module2 = self::getDataGenerator()->create_module('assign', $record);
// Check the forum was correctly created.
$this->assertEquals(1, $DB->count_records('forum', array('id' => $module1->id)));
// Check the assignment was correctly created.
- $this->assertEquals(1, $DB->count_records('assignment', array('id' => $module2->id)));
+ $this->assertEquals(1, $DB->count_records('assign', array('id' => $module2->id)));
// Check data exists in the course modules table.
$this->assertEquals(2, $DB->count_records_select('course_modules', 'id = :module1 OR id = :module2',
$this->assertEquals(0, $DB->count_records('forum', array('id' => $module1->id)));
// Check the assignment was deleted.
- $this->assertEquals(0, $DB->count_records('assignment', array('id' => $module2->id)));
+ $this->assertEquals(0, $DB->count_records('assign', array('id' => $module2->id)));
// Check we retrieve no data in the course modules table.
$this->assertEquals(0, $DB->count_records_select('course_modules', 'id = :module1 OR id = :module2',
// Create two modules.
$module1 = self::getDataGenerator()->create_module('forum', $record);
- $module2 = self::getDataGenerator()->create_module('assignment', $record);
+ $module2 = self::getDataGenerator()->create_module('assign', $record);
// Since these modules were recreated the user will not have capabilities
// to delete them, ensure exception is thrown if they try.
+++ /dev/null
-YUI.add('moodle-course-coursebase', function(Y) {
-
- /**
- * The coursebase class
- */
- var COURSEBASENAME = 'course-coursebase';
-
- var COURSEBASE = function() {
- COURSEBASE.superclass.constructor.apply(this, arguments);
- }
-
- Y.extend(COURSEBASE, Y.Base, {
- // Registered Modules
- registermodules : [],
-
- /**
- * Initialize the coursebase module
- */
- initializer : function(config) {
- // We don't actually perform any work here
- },
-
- /**
- * Register a new Javascript Module
- *
- * @param object The instantiated module to call functions on
- */
- register_module : function(object) {
- this.registermodules.push(object);
- },
-
- /**
- * Invoke the specified function in all registered modules with the given arguments
- *
- * @param functionname The name of the function to call
- * @param args The argument supplied to the function
- */
- invoke_function : function(functionname, args) {
- for (module in this.registermodules) {
- if (functionname in this.registermodules[module]) {
- this.registermodules[module][functionname](args);
- }
- }
- }
- },
- {
- NAME : COURSEBASENAME,
- ATTRS : {}
- }
- );
-
- // Ensure that M.course exists and that coursebase is initialised correctly
- M.course = M.course || {};
- M.course.coursebase = M.course.coursebase || new COURSEBASE();
-
- // Abstract functions that needs to be defined per format (course/format/somename/format.js)
- M.course.format = M.course.format || {}
-
- /**
- * Swap section (should be defined in format.js if requred)
- *
- * @param {YUI} Y YUI3 instance
- * @param {string} node1 node to swap to
- * @param {string} node2 node to swap with
- * @return {NodeList} section list
- */
- M.course.format.swap_sections = M.course.format.swap_sections || function(Y, node1, node2) {
- return null;
- }
-
- /**
- * Process sections after ajax response (should be defined in format.js)
- * If some response is expected, we pass it over to format, as it knows better
- * hot to process it.
- *
- * @param {YUI} Y YUI3 instance
- * @param {NodeList} list of sections
- * @param {array} response ajax response
- * @param {string} sectionfrom first affected section
- * @param {string} sectionto last affected section
- * @return void
- */
- M.course.format.process_sections = M.course.format.process_sections || function(Y, sectionlist, response, sectionfrom, sectionto) {
- return null;
- }
-
- /**
- * Get sections config for this format, for examples see function definition
- * in the formats.
- *
- * @return {object} section list configuration
- */
- M.course.format.get_config = M.course.format.get_config || function() {
- return {
- container_node : null, // compulsory
- container_class : null, // compulsory
- section_wrapper_node : null, // optional
- section_wrapper_class : null, // optional
- section_node : null, // compulsory
- section_class : null // compulsory
- }
- }
-
- /**
- * Get section list for this format (usually items inside container_node.container_class selector)
- *
- * @param {YUI} Y YUI3 instance
- * @return {string} section selector
- */
- M.course.format.get_section_selector = M.course.format.get_section_selector || function(Y) {
- var config = M.course.format.get_config();
- if (config.section_node && config.section_class) {
- return config.section_node + '.' + config.section_class;
- }
- console.log('section_node and section_class are not defined in M.course.format.get_config');
- return null;
- }
-
- /**
- * Get section wraper for this format (only used in case when each
- * container_node.container_class node is wrapped in some other element).
- *
- * @param {YUI} Y YUI3 instance
- * @return {string} section wrapper selector or M.course.format.get_section_selector
- * if section_wrapper_node and section_wrapper_class are not defined in the format config.
- */
- M.course.format.get_section_wrapper = M.course.format.get_section_wrapper || function(Y) {
- var config = M.course.format.get_config();
- if (config.section_wrapper_node && config.section_wrapper_class) {
- return config.section_wrapper_node + '.' + config.section_wrapper_class;
- }
- return M.course.format.get_section_selector(Y);
- }
-
- /**
- * Get the tag of container node
- *
- * @return {string} tag of container node.
- */
- M.course.format.get_containernode = M.course.format.get_containernode || function() {
- var config = M.course.format.get_config();
- if (config.container_node) {
- return config.container_node;
- } else {
- console.log('container_node is not defined in M.course.format.get_config');
- }
- }
-
- /**
- * Get the class of container node
- *
- * @return {string} class of the container node.
- */
- M.course.format.get_containerclass = M.course.format.get_containerclass || function() {
- var config = M.course.format.get_config();
- if (config.container_class) {
- return config.container_class;
- } else {
- console.log('container_class is not defined in M.course.format.get_config');
- }
- }
-
- /**
- * Get the tag of draggable node (section wrapper if exists, otherwise section)
- *
- * @return {string} tag of the draggable node.
- */
- M.course.format.get_sectionwrappernode = M.course.format.get_sectionwrappernode || function() {
- var config = M.course.format.get_config();
- if (config.section_wrapper_node) {
- return config.section_wrapper_node;
- } else {
- return config.section_node;
- }
- }
-
- /**
- * Get the class of draggable node (section wrapper if exists, otherwise section)
- *
- * @return {string} class of the draggable node.
- */
- M.course.format.get_sectionwrapperclass = M.course.format.get_sectionwrapperclass || function() {
- var config = M.course.format.get_config();
- if (config.section_wrapper_class) {
- return config.section_wrapper_class;
- } else {
- return config.section_class;
- }
- }
-
- /**
- * Get the tag of section node
- *
- * @return {string} tag of section node.
- */
- M.course.format.get_sectionnode = M.course.format.get_sectionnode || function() {
- var config = M.course.format.get_config();
- if (config.section_node) {
- return config.section_node;
- } else {
- console.log('section_node is not defined in M.course.format.get_config');
- }
- }
-
- /**
- * Get the class of section node
- *
- * @return {string} class of the section node.
- */
- M.course.format.get_sectionclass = M.course.format.get_sectionclass || function() {
- var config = M.course.format.get_config();
- if (config.section_class) {
- return config.section_class;
- } else {
- console.log('section_class is not defined in M.course.format.get_config');
- }
-
- }
-
-},
-'@VERSION@', {
- requires : ['base', 'node']
-}
-);
+++ /dev/null
-YUI.add('moodle-course-dragdrop', function(Y) {
-
- var CSS = {
- ACTIONAREA: '.actions',
- ACTIVITY : 'activity',
- ACTIVITYINSTANCE : 'activityinstance',
- CONTENT : 'content',
- COURSECONTENT : 'course-content',
- EDITINGMOVE : 'editing_move',
- ICONCLASS : 'iconsmall',
- JUMPMENU : 'jumpmenu',
- LEFT : 'left',
- LIGHTBOX : 'lightbox',
- MOVEDOWN : 'movedown',
- MOVEUP : 'moveup',
- PAGECONTENT : 'page-content',
- RIGHT : 'right',
- SECTION : 'section',
- SECTIONADDMENUS : 'section_add_menus',
- SECTIONHANDLE : 'section-handle',
- SUMMARY : 'summary',
- SECTIONDRAGGABLE: 'sectiondraggable'
- };
-
- var DRAGSECTION = function() {
- DRAGSECTION.superclass.constructor.apply(this, arguments);
- };
- Y.extend(DRAGSECTION, M.core.dragdrop, {
- sectionlistselector : null,
-
- initializer : function() {
- // Set group for parent class
- this.groups = [ CSS.SECTIONDRAGGABLE ];
- this.samenodeclass = M.course.format.get_sectionwrapperclass();
- this.parentnodeclass = M.course.format.get_containerclass();
-
- // Check if we are in single section mode
- if (Y.Node.one('.'+CSS.JUMPMENU)) {
- return false;
- }
- // Initialise sections dragging
- this.sectionlistselector = M.course.format.get_section_wrapper(Y);
- if (this.sectionlistselector) {
- this.sectionlistselector = '.'+CSS.COURSECONTENT+' '+this.sectionlistselector;
-
- this.setup_for_section(this.sectionlistselector);
-
- // Make each li element in the lists of sections draggable
- var del = new Y.DD.Delegate({
- container: '.'+CSS.COURSECONTENT,
- nodes: '.' + CSS.SECTIONDRAGGABLE,
- target: true,
- handles: ['.'+CSS.LEFT],
- dragConfig: {groups: this.groups}
- });
- del.dd.plug(Y.Plugin.DDProxy, {
- // Don't move the node at the end of the drag
- moveOnEnd: false
- });
- del.dd.plug(Y.Plugin.DDConstrained, {
- // Keep it inside the .course-content
- constrain: '#'+CSS.PAGECONTENT,
- stickY: true
- });
- del.dd.plug(Y.Plugin.DDWinScroll);
- }
- },
-
- /**
- * Apply dragdrop features to the specified selector or node that refers to section(s)
- *
- * @param baseselector The CSS selector or node to limit scope to
- * @return void
- */
- setup_for_section : function(baseselector) {
- Y.Node.all(baseselector).each(function(sectionnode) {
- // Determine the section ID
- var sectionid = Y.Moodle.core_course.util.section.getId(sectionnode);
-
- // We skip the top section as it is not draggable
- if (sectionid > 0) {
- // Remove move icons
- var movedown = sectionnode.one('.'+CSS.RIGHT+' a.'+CSS.MOVEDOWN);
- var moveup = sectionnode.one('.'+CSS.RIGHT+' a.'+CSS.MOVEUP);
-
- // Add dragger icon
- var title = M.util.get_string('movesection', 'moodle', sectionid);
- var cssleft = sectionnode.one('.'+CSS.LEFT);
-
- if ((movedown || moveup) && cssleft) {
- cssleft.setStyle('cursor', 'move');
- cssleft.appendChild(this.get_drag_handle(title, CSS.SECTIONHANDLE, 'icon', true));
-
- if (moveup) {
- moveup.remove();
- }
- if (movedown) {
- movedown.remove();
- }
-
- // This section can be moved - add the class to indicate this to Y.DD.
- sectionnode.addClass(CSS.SECTIONDRAGGABLE);
- }
- }
- }, this);
- },
-
- /*
- * Drag-dropping related functions
- */
- drag_start : function(e) {
- // Get our drag object
- var drag = e.target;
- // Creat a dummy structure of the outer elemnents for clean styles application
- var containernode = Y.Node.create('<'+M.course.format.get_containernode()+'></'+M.course.format.get_containernode()+'>');
- containernode.addClass(M.course.format.get_containerclass());
- var sectionnode = Y.Node.create('<'+ M.course.format.get_sectionwrappernode()+'></'+ M.course.format.get_sectionwrappernode()+'>');
- sectionnode.addClass( M.course.format.get_sectionwrapperclass());
- sectionnode.setStyle('margin', 0);
- sectionnode.setContent(drag.get('node').get('innerHTML'));
- containernode.appendChild(sectionnode);
- drag.get('dragNode').setContent(containernode);
- drag.get('dragNode').addClass(CSS.COURSECONTENT);
- },
-
- drag_dropmiss : function(e) {
- // Missed the target, but we assume the user intended to drop it
- // on the last last ghost node location, e.drag and e.drop should be
- // prepared by global_drag_dropmiss parent so simulate drop_hit(e).
- this.drop_hit(e);
- },
-
- get_section_index: function(node) {
- var sectionlistselector = '.' + CSS.COURSECONTENT + ' ' + M.course.format.get_section_selector(Y),
- sectionList = Y.all(sectionlistselector),
- nodeIndex = sectionList.indexOf(node),
- zeroIndex = sectionList.indexOf(Y.one('#section-0'));
-
- return (nodeIndex - zeroIndex);
- },
-
- drop_hit : function(e) {
- var drag = e.drag;
-
- // Get references to our nodes and their IDs.
- var dragnode = drag.get('node'),
- dragnodeid = Y.Moodle.core_course.util.section.getId(dragnode),
- loopstart = dragnodeid,
-
- dropnodeindex = this.get_section_index(dragnode),
- loopend = dropnodeindex;
-
- if (dragnodeid === dropnodeindex) {
- Y.log("Skipping move - same location moving " + dragnodeid + " to " + dropnodeindex, 'debug', 'moodle-course-dragdrop');
- return;
- }
-
- Y.log("Moving from position " + dragnodeid + " to position " + dropnodeindex, 'debug', 'moodle-course-dragdrop');
-
- if (loopstart > loopend) {
- // If we're going up, we need to swap the loop order
- // because loops can't go backwards.
- loopstart = dropnodeindex;
- loopend = dragnodeid;
- }
-
- // Get the list of nodes.
- drag.get('dragNode').removeClass(CSS.COURSECONTENT);
- var sectionlist = Y.Node.all(this.sectionlistselector);
-
- // Add a lightbox if it's not there.
- var lightbox = M.util.add_lightbox(Y, dragnode);
-
- // Handle any variables which we must pass via AJAX.
- var params = {},
- pageparams = this.get('config').pageparams,
- varname;
-
- for (varname in pageparams) {
- if (!pageparams.hasOwnProperty(varname)) {
- continue;
- }
- params[varname] = pageparams[varname];
- }
-
- // Prepare request parameters
- params.sesskey = M.cfg.sesskey;
- params.courseId = this.get('courseid');
- params['class'] = 'section';
- params.field = 'move';
- params.id = dragnodeid;
- params.value = dropnodeindex;
-
- // Perform the AJAX request.
- var uri = M.cfg.wwwroot + this.get('ajaxurl');
- Y.io(uri, {
- method: 'POST',
- data: params,
- on: {
- start : function() {
- lightbox.show();
- },
- success: function(tid, response) {
- // Update section titles, we can't simply swap them as
- // they might have custom title
- try {
- var responsetext = Y.JSON.parse(response.responseText);
- if (responsetext.error) {
- new M.core.ajaxException(responsetext);
- }
- M.course.format.process_sections(Y, sectionlist, responsetext, loopstart, loopend);
- } catch (e) {}
-
- // Update all of the section IDs - first unset them, then set them
- // to avoid duplicates in the DOM.
- var index;
-
- // Classic bubble sort algorithm is applied to the section
- // nodes between original drag node location and the new one.
- var swapped = false;
- do {
- swapped = false;
- for (index = loopstart; index <= loopend; index++) {
- if (Y.Moodle.core_course.util.section.getId(sectionlist.item(index - 1)) >
- Y.Moodle.core_course.util.section.getId(sectionlist.item(index))) {
- Y.log("Swapping " + Y.Moodle.core_course.util.section.getId(sectionlist.item(index - 1)) +
- " with " + Y.Moodle.core_course.util.section.getId(sectionlist.item(index)));
- // Swap section id.
- var sectionid = sectionlist.item(index - 1).get('id');
- sectionlist.item(index - 1).set('id', sectionlist.item(index).get('id'));
- sectionlist.item(index).set('id', sectionid);
-
- // See what format needs to swap.
- M.course.format.swap_sections(Y, index - 1, index);
-
- // Update flag.
- swapped = true;
- }
- }
- loopend = loopend - 1;
- } while (swapped);
-
- window.setTimeout(function() {
- lightbox.hide();
- }, 250);
- },
-
- failure: function(tid, response) {
- this.ajax_failure(response);
- lightbox.hide();
- }
- },
- context:this
- });
- }
-
- }, {
- NAME : 'course-dragdrop-section',
- ATTRS : {
- courseid : {
- value : null
- },
- ajaxurl : {
- 'value' : 0
- },
- config : {
- 'value' : 0
- }
- }
- });
-
- var DRAGRESOURCE = function() {
- DRAGRESOURCE.superclass.constructor.apply(this, arguments);
- };
- Y.extend(DRAGRESOURCE, M.core.dragdrop, {
- initializer : function(params) {
- // Set group for parent class
- this.groups = ['resource'];
- this.samenodeclass = CSS.ACTIVITY;
- this.parentnodeclass = CSS.SECTION;
- this.resourcedraghandle = this.get_drag_handle(M.str.moodle.move, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
-
- // Go through all sections
- var sectionlistselector = M.course.format.get_section_selector(Y);
- if (sectionlistselector) {
- sectionlistselector = '.'+CSS.COURSECONTENT+' '+sectionlistselector;
- this.setup_for_section(sectionlistselector);
-
- // Initialise drag & drop for all resources/activities
- var nodeselector = sectionlistselector.slice(CSS.COURSECONTENT.length+2)+' li.'+CSS.ACTIVITY;
- var del = new Y.DD.Delegate({
- container: '.'+CSS.COURSECONTENT,
- nodes: nodeselector,
- target: true,
- handles: ['.' + CSS.EDITINGMOVE],
- dragConfig: {groups: this.groups}
- });
- del.dd.plug(Y.Plugin.DDProxy, {
- // Don't move the node at the end of the drag
- moveOnEnd: false,
- cloneNode: true
- });
- del.dd.plug(Y.Plugin.DDConstrained, {
- // Keep it inside the .course-content
- constrain: '#'+CSS.PAGECONTENT
- });
- del.dd.plug(Y.Plugin.DDWinScroll);
-
- M.course.coursebase.register_module(this);
- M.course.dragres = this;
- }
- },
-
- /**
- * Apply dragdrop features to the specified selector or node that refers to section(s)
- *
- * @param baseselector The CSS selector or node to limit scope to
- * @return void
- */
- setup_for_section : function(baseselector) {
- Y.Node.all(baseselector).each(function(sectionnode) {
- var resources = sectionnode.one('.'+CSS.CONTENT+' ul.'+CSS.SECTION);
- // See if resources ul exists, if not create one
- if (!resources) {
- var resources = Y.Node.create('<ul></ul>');
- resources.addClass(CSS.SECTION);
- sectionnode.one('.'+CSS.CONTENT+' div.'+CSS.SUMMARY).insert(resources, 'after');
- }
- resources.setAttribute('data-draggroups', this.groups.join(' '));
- // Define empty ul as droptarget, so that item could be moved to empty list
- var tar = new Y.DD.Drop({
- node: resources,
- groups: this.groups,
- padding: '20 0 20 0'
- });
-
- // Initialise each resource/activity in this section
- this.setup_for_resource('#'+sectionnode.get('id')+' li.'+CSS.ACTIVITY);
- }, this);
- },
- /**
- * Apply dragdrop features to the specified selector or node that refers to resource(s)
- *
- * @param baseselector The CSS selector or node to limit scope to
- * @return void
- */
- setup_for_resource : function(baseselector) {
- Y.Node.all(baseselector).each(function(resourcesnode) {
- // Replace move icons
- var move = resourcesnode.one('a.'+CSS.EDITINGMOVE);
- if (move) {
- move.replace(this.resourcedraghandle.cloneNode(true));
- }
- }, this);
- },
-
- drag_start : function(e) {
- // Get our drag object
- var drag = e.target;
- drag.get('dragNode').setContent(drag.get('node').get('innerHTML'));
- drag.get('dragNode').all('img.iconsmall').setStyle('vertical-align', 'baseline');
- },
-
- drag_dropmiss : function(e) {
- // Missed the target, but we assume the user intended to drop it
- // on the last last ghost node location, e.drag and e.drop should be
- // prepared by global_drag_dropmiss parent so simulate drop_hit(e).
- this.drop_hit(e);
- },
-
- drop_hit : function(e) {
- var drag = e.drag;
- // Get a reference to our drag node
- var dragnode = drag.get('node');
- var dropnode = e.drop.get('node');
-
- // Add spinner if it not there
- var actionarea = dragnode.one(CSS.ACTIONAREA);
- var spinner = M.util.add_spinner(Y, actionarea);
-
- var params = {};
-
- // Handle any variables which we must pass back through to
- var pageparams = this.get('config').pageparams;
- var varname;
- for (varname in pageparams) {
- params[varname] = pageparams[varname];
- }
-
- // Prepare request parameters
- params.sesskey = M.cfg.sesskey;
- params.courseId = this.get('courseid');
- params['class'] = 'resource';
- params.field = 'move';
- params.id = Number(Y.Moodle.core_course.util.cm.getId(dragnode));
- params.sectionId = Y.Moodle.core_course.util.section.getId(dropnode.ancestor(M.course.format.get_section_wrapper(Y), true));
-
- if (dragnode.next()) {
- params.beforeId = Number(Y.Moodle.core_course.util.cm.getId(dragnode.next()));
- }
-
- // Do AJAX request
- var uri = M.cfg.wwwroot + this.get('ajaxurl');
-
- Y.io(uri, {
- method: 'POST',
- data: params,
- on: {
- start : function(tid) {
- this.lock_drag_handle(drag, CSS.EDITINGMOVE);
- spinner.show();
- },
- success: function(tid, response) {
- var responsetext = Y.JSON.parse(response.responseText);
- var params = {element: dragnode, visible: responsetext.visible};
- M.course.coursebase.invoke_function('set_visibility_resource_ui', params);
- this.unlock_drag_handle(drag, CSS.EDITINGMOVE);
- window.setTimeout(function(e) {
- spinner.hide();
- }, 250);
- },
- failure: function(tid, response) {
- this.ajax_failure(response);
- this.unlock_drag_handle(drag, CSS.SECTIONHANDLE);
- spinner.hide();
- // TODO: revert nodes location
- }
- },
- context:this
- });
- }
- }, {
- NAME : 'course-dragdrop-resource',
- ATTRS : {
- courseid : {
- value : null
- },
- ajaxurl : {
- 'value' : 0
- },
- config : {
- 'value' : 0
- }
- }
- });
-
- M.course = M.course || {};
- M.course.init_resource_dragdrop = function(params) {
- new DRAGRESOURCE(params);
- }
- M.course.init_section_dragdrop = function(params) {
- new DRAGSECTION(params);
- }
-}, '@VERSION@', {requires:['base', 'node', 'io', 'dom', 'dd', 'dd-scroll', 'moodle-core-dragdrop', 'moodle-core-notification', 'moodle-course-coursebase', 'moodle-course-util']});
+++ /dev/null
-YUI.add('moodle-course-formatchooser', function(Y) {
- var FORMATCHOOSER = function() {
- FORMATCHOOSER.superclass.constructor.apply(this, arguments);
- }
-
- Y.extend(FORMATCHOOSER, Y.Base, {
- initializer : function(params) {
- if (params && params.formid) {
- var updatebut = Y.one('#'+params.formid+' #id_updatecourseformat');
- var formatselect = Y.one('#'+params.formid+' #id_format');
- if (updatebut && formatselect) {
- updatebut.setStyle('display', 'none');
- formatselect.on('change', function() {
- updatebut.simulate('click');
- });
- }
- }
- }
- });
-
- M.course = M.course || {};
- M.course.init_formatchooser = function(params) {
- return new FORMATCHOOSER(params);
- }
-}, '@VERSION@', {requires:['base', 'node', 'node-event-simulate']});
--- /dev/null
+{
+ "name": "moodle-course-coursebase",
+ "builds": {
+ "moodle-course-coursebase": {
+ "jsfiles": [
+ "coursebase.js"
+ ]
+ }
+ }
+}
--- /dev/null
+/**
+ * The coursebase class to provide shared functionality to Modules within
+ * Moodle.
+ *
+ * @module moodle-course-coursebase
+ */
+var COURSEBASENAME = 'course-coursebase';
+
+var COURSEBASE = function() {
+ COURSEBASE.superclass.constructor.apply(this, arguments);
+};
+
+/**
+ * The coursebase class to provide shared functionality to Modules within
+ * Moodle.
+ *
+ * @class M.course.coursebase
+ * @constructor
+ */
+Y.extend(COURSEBASE, Y.Base, {
+ // Registered Modules
+ registermodules : [],
+
+ /**
+ * Register a new Javascript Module
+ *
+ * @method register_module
+ * @param {Object} The instantiated module to call functions on
+ * @chainable
+ */
+ register_module : function(object) {
+ this.registermodules.push(object);
+
+ return this;
+ },
+
+ /**
+ * Invoke the specified function in all registered modules with the given arguments
+ *
+ * @method invoke_function
+ * @param {String} functionname The name of the function to call
+ * @param {mixed} args The argument supplied to the function
+ * @chainable
+ */
+ invoke_function : function(functionname, args) {
+ var module;
+ for (module in this.registermodules) {
+ if (functionname in this.registermodules[module]) {
+ this.registermodules[module][functionname](args);
+ }
+ }
+
+ return this;
+ }
+}, {
+ NAME : COURSEBASENAME,
+ ATTRS : {}
+});
+
+// Ensure that M.course exists and that coursebase is initialised correctly
+M.course = M.course || {};
+M.course.coursebase = M.course.coursebase || new COURSEBASE();
+
+// Abstract functions that needs to be defined per format (course/format/somename/format.js)
+M.course.format = M.course.format || {};
+
+/**
+ * Swap section (should be defined in format.js if requred)
+ *
+ * @param {YUI} Y YUI3 instance
+ * @param {string} node1 node to swap to
+ * @param {string} node2 node to swap with
+ * @return {NodeList} section list
+ */
+M.course.format.swap_sections = M.course.format.swap_sections || function() {
+ return null;
+};
+
+/**
+ * Process sections after ajax response (should be defined in format.js)
+ * If some response is expected, we pass it over to format, as it knows better
+ * hot to process it.
+ *
+ * @param {YUI} Y YUI3 instance
+ * @param {NodeList} list of sections
+ * @param {array} response ajax response
+ * @param {string} sectionfrom first affected section
+ * @param {string} sectionto last affected section
+ * @return void
+ */
+M.course.format.process_sections = M.course.format.process_sections || function() {
+ return null;
+};
+
+/**
+* Get sections config for this format, for examples see function definition
+* in the formats.
+*
+* @return {object} section list configuration
+*/
+M.course.format.get_config = M.course.format.get_config || function() {
+ return {
+ container_node : null, // compulsory
+ container_class : null, // compulsory
+ section_wrapper_node : null, // optional
+ section_wrapper_class : null, // optional
+ section_node : null, // compulsory
+ section_class : null // compulsory
+ };
+};
+
+/**
+ * Get section list for this format (usually items inside container_node.container_class selector)
+ *
+ * @param {YUI} Y YUI3 instance
+ * @return {string} section selector
+ */
+M.course.format.get_section_selector = M.course.format.get_section_selector || function() {
+ var config = M.course.format.get_config();
+ if (config.section_node && config.section_class) {
+ return config.section_node + '.' + config.section_class;
+ }
+ Y.log('section_node and section_class are not defined in M.course.format.get_config', 'warn', 'moodle-course-coursebase');
+ return null;
+};
+
+/**
+ * Get section wraper for this format (only used in case when each
+ * container_node.container_class node is wrapped in some other element).
+ *
+ * @param {YUI} Y YUI3 instance
+ * @return {string} section wrapper selector or M.course.format.get_section_selector
+ * if section_wrapper_node and section_wrapper_class are not defined in the format config.
+ */
+M.course.format.get_section_wrapper = M.course.format.get_section_wrapper || function(Y) {
+ var config = M.course.format.get_config();
+ if (config.section_wrapper_node && config.section_wrapper_class) {
+ return config.section_wrapper_node + '.' + config.section_wrapper_class;
+ }
+ return M.course.format.get_section_selector(Y);
+};
+
+/**
+ * Get the tag of container node
+ *
+ * @return {string} tag of container node.
+ */
+M.course.format.get_containernode = M.course.format.get_containernode || function() {
+ var config = M.course.format.get_config();
+ if (config.container_node) {
+ return config.container_node;
+ } else {
+ Y.log('container_node is not defined in M.course.format.get_config', 'warn', 'moodle-course-coursebase');
+ }
+};
+
+/**
+ * Get the class of container node
+ *
+ * @return {string} class of the container node.
+ */
+M.course.format.get_containerclass = M.course.format.get_containerclass || function() {
+ var config = M.course.format.get_config();
+ if (config.container_class) {
+ return config.container_class;
+ } else {
+ Y.log('container_class is not defined in M.course.format.get_config', 'warn', 'moodle-course-coursebase');
+ }
+};
+
+/**
+ * Get the tag of draggable node (section wrapper if exists, otherwise section)
+ *
+ * @return {string} tag of the draggable node.
+ */
+M.course.format.get_sectionwrappernode = M.course.format.get_sectionwrappernode || function() {
+ var config = M.course.format.get_config();
+ if (config.section_wrapper_node) {
+ return config.section_wrapper_node;
+ } else {
+ return config.section_node;
+ }
+};
+
+/**
+ * Get the class of draggable node (section wrapper if exists, otherwise section)
+ *
+ * @return {string} class of the draggable node.
+ */
+M.course.format.get_sectionwrapperclass = M.course.format.get_sectionwrapperclass || function() {
+ var config = M.course.format.get_config();
+ if (config.section_wrapper_class) {
+ return config.section_wrapper_class;
+ } else {
+ return config.section_class;
+ }
+};
+
+/**
+ * Get the tag of section node
+ *
+ * @return {string} tag of section node.
+ */
+M.course.format.get_sectionnode = M.course.format.get_sectionnode || function() {
+ var config = M.course.format.get_config();
+ if (config.section_node) {
+ return config.section_node;
+ } else {
+ Y.log('section_node is not defined in M.course.format.get_config', 'warn', 'moodle-course-coursebase');
+ }
+};
+
+/**
+ * Get the class of section node
+ *
+ * @return {string} class of the section node.
+ */
+M.course.format.get_sectionclass = M.course.format.get_sectionclass || function() {
+ var config = M.course.format.get_config();
+ if (config.section_class) {
+ return config.section_class;
+ } else {
+ Y.log('section_class is not defined in M.course.format.get_config', 'warn', 'moodle-course-coursebase');
+ }
+};
--- /dev/null
+{
+ "moodle-course-coursebase": {
+ "requires": [
+ "base",
+ "node"
+ ]
+ }
+}
--- /dev/null
+{
+ "name": "moodle-course-dragdrop",
+ "builds": {
+ "moodle-course-dragdrop": {
+ "jsfiles": [
+ "dragdrop.js",
+ "section.js",
+ "resource.js"
+ ]
+ }
+ }
+}
--- /dev/null
+/**
+ * Drag and Drop for course sections and course modules.
+ *
+ * @module moodle-course-dragdrop
+ */
+
+var CSS = {
+ ACTIONAREA: '.actions',
+ ACTIVITY: 'activity',
+ ACTIVITYINSTANCE: 'activityinstance',
+ CONTENT: 'content',
+ COURSECONTENT: 'course-content',
+ EDITINGMOVE: 'editing_move',
+ ICONCLASS: 'iconsmall',
+ JUMPMENU: 'jumpmenu',
+ LEFT: 'left',
+ LIGHTBOX: 'lightbox',
+ MOVEDOWN: 'movedown',
+ MOVEUP: 'moveup',
+ PAGECONTENT: 'page-content',
+ RIGHT: 'right',
+ SECTION: 'section',
+ SECTIONADDMENUS: 'section_add_menus',
+ SECTIONHANDLE: 'section-handle',
+ SUMMARY: 'summary',
+ SECTIONDRAGGABLE: 'sectiondraggable'
+};
+
+M.course = M.course || {};
--- /dev/null
+/**
+ * Resource drag and drop.
+ *
+ * @class M.course.dragdrop.resource
+ * @constructor
+ * @extends M.core.dragdrop
+ */
+var DRAGRESOURCE = function() {
+ DRAGRESOURCE.superclass.constructor.apply(this, arguments);
+};
+Y.extend(DRAGRESOURCE, M.core.dragdrop, {
+ initializer: function() {
+ // Set group for parent class
+ this.groups = ['resource'];
+ this.samenodeclass = CSS.ACTIVITY;
+ this.parentnodeclass = CSS.SECTION;
+ this.resourcedraghandle = this.get_drag_handle(M.str.moodle.move, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+
+ // Go through all sections
+ var sectionlistselector = M.course.format.get_section_selector(Y);
+ if (sectionlistselector) {
+ sectionlistselector = '.' + CSS.COURSECONTENT + ' ' + sectionlistselector;
+ this.setup_for_section(sectionlistselector);
+
+ // Initialise drag & drop for all resources/activities
+ var nodeselector = sectionlistselector.slice(CSS.COURSECONTENT.length + 2) + ' li.' + CSS.ACTIVITY;
+ var del = new Y.DD.Delegate({
+ container: '.' + CSS.COURSECONTENT,
+ nodes: nodeselector,
+ target: true,
+ handles: ['.' + CSS.EDITINGMOVE],
+ dragConfig: {groups: this.groups}
+ });
+ del.dd.plug(Y.Plugin.DDProxy, {
+ // Don't move the node at the end of the drag
+ moveOnEnd: false,
+ cloneNode: true
+ });
+ del.dd.plug(Y.Plugin.DDConstrained, {
+ // Keep it inside the .course-content
+ constrain: '#' + CSS.PAGECONTENT
+ });
+ del.dd.plug(Y.Plugin.DDWinScroll);
+
+ M.course.coursebase.register_module(this);
+ M.course.dragres = this;
+ }
+ },
+
+ /**
+ * Apply dragdrop features to the specified selector or node that refers to section(s)
+ *
+ * @method setup_for_section
+ * @param {String} baseselector The CSS selector or node to limit scope to
+ */
+ setup_for_section: function(baseselector) {
+ Y.Node.all(baseselector).each(function(sectionnode) {
+ var resources = sectionnode.one('.' + CSS.CONTENT + ' ul.' + CSS.SECTION);
+ // See if resources ul exists, if not create one
+ if (!resources) {
+ resources = Y.Node.create('<ul></ul>');
+ resources.addClass(CSS.SECTION);
+ sectionnode.one('.' + CSS.CONTENT + ' div.' + CSS.SUMMARY).insert(resources, 'after');
+ }
+ resources.setAttribute('data-draggroups', this.groups.join(' '));
+ // Define empty ul as droptarget, so that item could be moved to empty list
+ new Y.DD.Drop({
+ node: resources,
+ groups: this.groups,
+ padding: '20 0 20 0'
+ });
+
+ // Initialise each resource/activity in this section
+ this.setup_for_resource('#' + sectionnode.get('id') + ' li.' + CSS.ACTIVITY);
+ }, this);
+ },
+
+ /**
+ * Apply dragdrop features to the specified selector or node that refers to resource(s)
+ *
+ * @method setup_for_resource
+ * @param {String} baseselector The CSS selector or node to limit scope to
+ */
+ setup_for_resource: function(baseselector) {
+ Y.Node.all(baseselector).each(function(resourcesnode) {
+ // Replace move icons
+ var move = resourcesnode.one('a.' + CSS.EDITINGMOVE);
+ if (move) {
+ move.replace(this.resourcedraghandle.cloneNode(true));
+ }
+ }, this);
+ },
+
+ drag_start: function(e) {
+ // Get our drag object
+ var drag = e.target;
+ drag.get('dragNode').setContent(drag.get('node').get('innerHTML'));
+ drag.get('dragNode').all('img.iconsmall').setStyle('vertical-align', 'baseline');
+ },
+
+ drag_dropmiss: function(e) {
+ // Missed the target, but we assume the user intended to drop it
+ // on the last last ghost node location, e.drag and e.drop should be
+ // prepared by global_drag_dropmiss parent so simulate drop_hit(e).
+ this.drop_hit(e);
+ },
+
+ drop_hit: function(e) {
+ var drag = e.drag;
+ // Get a reference to our drag node
+ var dragnode = drag.get('node');
+ var dropnode = e.drop.get('node');
+
+ // Add spinner if it not there
+ var actionarea = dragnode.one(CSS.ACTIONAREA);
+ var spinner = M.util.add_spinner(Y, actionarea);
+
+ var params = {};
+
+ // Handle any variables which we must pass back through to
+ var pageparams = this.get('config').pageparams;
+ var varname;
+ for (varname in pageparams) {
+ params[varname] = pageparams[varname];
+ }
+
+ // Prepare request parameters
+ params.sesskey = M.cfg.sesskey;
+ params.courseId = this.get('courseid');
+ params['class'] = 'resource';
+ params.field = 'move';
+ params.id = Number(Y.Moodle.core_course.util.cm.getId(dragnode));
+ params.sectionId = Y.Moodle.core_course.util.section.getId(dropnode.ancestor(M.course.format.get_section_wrapper(Y), true));
+
+ if (dragnode.next()) {
+ params.beforeId = Number(Y.Moodle.core_course.util.cm.getId(dragnode.next()));
+ }
+
+ // Do AJAX request
+ var uri = M.cfg.wwwroot + this.get('ajaxurl');
+
+ Y.io(uri, {
+ method: 'POST',
+ data: params,
+ on: {
+ start: function() {
+ this.lock_drag_handle(drag, CSS.EDITINGMOVE);
+ spinner.show();
+ },
+ success: function(tid, response) {
+ var responsetext = Y.JSON.parse(response.responseText);
+ var params = {element: dragnode, visible: responsetext.visible};
+ M.course.coursebase.invoke_function('set_visibility_resource_ui', params);
+ this.unlock_drag_handle(drag, CSS.EDITINGMOVE);
+ window.setTimeout(function() {
+ spinner.hide();
+ }, 250);
+ },
+ failure: function(tid, response) {
+ this.ajax_failure(response);
+ this.unlock_drag_handle(drag, CSS.SECTIONHANDLE);
+ spinner.hide();
+ // TODO: revert nodes location
+ }
+ },
+ context:this
+ });
+ }
+}, {
+ NAME: 'course-dragdrop-resource',
+ ATTRS: {
+ courseid: {
+ value: null
+ },
+ ajaxurl: {
+ value: 0
+ },
+ config: {
+ value: 0
+ }
+ }
+});
+
+M.course = M.course || {};
+M.course.init_resource_dragdrop = function(params) {
+ new DRAGRESOURCE(params);
+};
--- /dev/null
+/**
+ * Section drag and drop.
+ *
+ * @class M.course.dragdrop.section
+ * @constructor
+ * @extends M.core.dragdrop
+ */
+var DRAGSECTION = function() {
+ DRAGSECTION.superclass.constructor.apply(this, arguments);
+};
+Y.extend(DRAGSECTION, M.core.dragdrop, {
+ sectionlistselector: null,
+
+ initializer: function() {
+ // Set group for parent class
+ this.groups = [ CSS.SECTIONDRAGGABLE ];
+ this.samenodeclass = M.course.format.get_sectionwrapperclass();
+ this.parentnodeclass = M.course.format.get_containerclass();
+
+ // Check if we are in single section mode
+ if (Y.Node.one('.' + CSS.JUMPMENU)) {
+ return false;
+ }
+ // Initialise sections dragging
+ this.sectionlistselector = M.course.format.get_section_wrapper(Y);
+ if (this.sectionlistselector) {
+ this.sectionlistselector = '.' + CSS.COURSECONTENT + ' ' + this.sectionlistselector;
+
+ this.setup_for_section(this.sectionlistselector);
+
+ // Make each li element in the lists of sections draggable
+ var del = new Y.DD.Delegate({
+ container: '.' + CSS.COURSECONTENT,
+ nodes: '.' + CSS.SECTIONDRAGGABLE,
+ target: true,
+ handles: ['.' + CSS.LEFT],
+ dragConfig: {groups: this.groups}
+ });
+ del.dd.plug(Y.Plugin.DDProxy, {
+ // Don't move the node at the end of the drag
+ moveOnEnd: false
+ });
+ del.dd.plug(Y.Plugin.DDConstrained, {
+ // Keep it inside the .course-content
+ constrain: '#' + CSS.PAGECONTENT,
+ stickY: true
+ });
+ del.dd.plug(Y.Plugin.DDWinScroll);
+ }
+ },
+
+ /**
+ * Apply dragdrop features to the specified selector or node that refers to section(s)
+ *
+ * @method setup_for_section
+ * @param {String} baseselector The CSS selector or node to limit scope to
+ */
+ setup_for_section: function(baseselector) {
+ Y.Node.all(baseselector).each(function(sectionnode) {
+ // Determine the section ID
+ var sectionid = Y.Moodle.core_course.util.section.getId(sectionnode);
+
+ // We skip the top section as it is not draggable
+ if (sectionid > 0) {
+ // Remove move icons
+ var movedown = sectionnode.one('.' + CSS.RIGHT + ' a.' + CSS.MOVEDOWN);
+ var moveup = sectionnode.one('.' + CSS.RIGHT + ' a.' + CSS.MOVEUP);
+
+ // Add dragger icon
+ var title = M.util.get_string('movesection', 'moodle', sectionid);
+ var cssleft = sectionnode.one('.' + CSS.LEFT);
+
+ if ((movedown || moveup) && cssleft) {
+ cssleft.setStyle('cursor', 'move');
+ cssleft.appendChild(this.get_drag_handle(title, CSS.SECTIONHANDLE, 'icon', true));
+
+ if (moveup) {
+ moveup.remove();
+ }
+ if (movedown) {
+ movedown.remove();
+ }
+
+ // This section can be moved - add the class to indicate this to Y.DD.
+ sectionnode.addClass(CSS.SECTIONDRAGGABLE);
+ }
+ }
+ }, this);
+ },
+
+ /*
+ * Drag-dropping related functions
+ */
+ drag_start: function(e) {
+ // Get our drag object
+ var drag = e.target;
+ // Creat a dummy structure of the outer elemnents for clean styles application
+ var containernode = Y.Node.create('<' + M.course.format.get_containernode() + '></' + M.course.format.get_containernode() + '>');
+ containernode.addClass(M.course.format.get_containerclass());
+ var sectionnode = Y.Node.create('<' + M.course.format.get_sectionwrappernode() + '></' + M.course.format.get_sectionwrappernode() + '>');
+ sectionnode.addClass( M.course.format.get_sectionwrapperclass());
+ sectionnode.setStyle('margin', 0);
+ sectionnode.setContent(drag.get('node').get('innerHTML'));
+ containernode.appendChild(sectionnode);
+ drag.get('dragNode').setContent(containernode);
+ drag.get('dragNode').addClass(CSS.COURSECONTENT);
+ },
+
+ drag_dropmiss: function(e) {
+ // Missed the target, but we assume the user intended to drop it
+ // on the last last ghost node location, e.drag and e.drop should be
+ // prepared by global_drag_dropmiss parent so simulate drop_hit(e).
+ this.drop_hit(e);
+ },
+
+ get_section_index: function(node) {
+ var sectionlistselector = '.' + CSS.COURSECONTENT + ' ' + M.course.format.get_section_selector(Y),
+ sectionList = Y.all(sectionlistselector),
+ nodeIndex = sectionList.indexOf(node),
+ zeroIndex = sectionList.indexOf(Y.one('#section-0'));
+
+ return (nodeIndex - zeroIndex);
+ },
+
+ drop_hit: function(e) {
+ var drag = e.drag;
+
+ // Get references to our nodes and their IDs.
+ var dragnode = drag.get('node'),
+ dragnodeid = Y.Moodle.core_course.util.section.getId(dragnode),
+ loopstart = dragnodeid,
+
+ dropnodeindex = this.get_section_index(dragnode),
+ loopend = dropnodeindex;
+
+ if (dragnodeid === dropnodeindex) {
+ Y.log("Skipping move - same location moving " + dragnodeid + " to " + dropnodeindex, 'debug', 'moodle-course-dragdrop');
+ return;
+ }
+
+ Y.log("Moving from position " + dragnodeid + " to position " + dropnodeindex, 'debug', 'moodle-course-dragdrop');
+
+ if (loopstart > loopend) {
+ // If we're going up, we need to swap the loop order
+ // because loops can't go backwards.
+ loopstart = dropnodeindex;
+ loopend = dragnodeid;
+ }
+
+ // Get the list of nodes.
+ drag.get('dragNode').removeClass(CSS.COURSECONTENT);
+ var sectionlist = Y.Node.all(this.sectionlistselector);
+
+ // Add a lightbox if it's not there.
+ var lightbox = M.util.add_lightbox(Y, dragnode);
+
+ // Handle any variables which we must pass via AJAX.
+ var params = {},
+ pageparams = this.get('config').pageparams,
+ varname;
+
+ for (varname in pageparams) {
+ if (!pageparams.hasOwnProperty(varname)) {
+ continue;
+ }
+ params[varname] = pageparams[varname];
+ }
+
+ // Prepare request parameters
+ params.sesskey = M.cfg.sesskey;
+ params.courseId = this.get('courseid');
+ params['class'] = 'section';
+ params.field = 'move';
+ params.id = dragnodeid;
+ params.value = dropnodeindex;
+
+ // Perform the AJAX request.
+ var uri = M.cfg.wwwroot + this.get('ajaxurl');
+ Y.io(uri, {
+ method: 'POST',
+ data: params,
+ on: {
+ start: function() {
+ lightbox.show();
+ },
+ success: function(tid, response) {
+ // Update section titles, we can't simply swap them as
+ // they might have custom title
+ try {
+ var responsetext = Y.JSON.parse(response.responseText);
+ if (responsetext.error) {
+ new M.core.ajaxException(responsetext);
+ }
+ M.course.format.process_sections(Y, sectionlist, responsetext, loopstart, loopend);
+ } catch (e) {}
+
+ // Update all of the section IDs - first unset them, then set them
+ // to avoid duplicates in the DOM.
+ var index;
+
+ // Classic bubble sort algorithm is applied to the section
+ // nodes between original drag node location and the new one.
+ var swapped = false;
+ do {
+ swapped = false;
+ for (index = loopstart; index <= loopend; index++) {
+ if (Y.Moodle.core_course.util.section.getId(sectionlist.item(index - 1)) >
+ Y.Moodle.core_course.util.section.getId(sectionlist.item(index))) {
+ Y.log("Swapping " + Y.Moodle.core_course.util.section.getId(sectionlist.item(index - 1)) +
+ " with " + Y.Moodle.core_course.util.section.getId(sectionlist.item(index)));
+ // Swap section id.
+ var sectionid = sectionlist.item(index - 1).get('id');
+ sectionlist.item(index - 1).set('id', sectionlist.item(index).get('id'));
+ sectionlist.item(index).set('id', sectionid);
+
+ // See what format needs to swap.
+ M.course.format.swap_sections(Y, index - 1, index);
+
+ // Update flag.
+ swapped = true;
+ }
+ }
+ loopend = loopend - 1;
+ } while (swapped);
+
+ window.setTimeout(function() {
+ lightbox.hide();
+ }, 250);
+ },
+
+ failure: function(tid, response) {
+ this.ajax_failure(response);
+ lightbox.hide();
+ }
+ },
+ context:this
+ });
+ }
+
+}, {
+ NAME: 'course-dragdrop-section',
+ ATTRS: {
+ courseid: {
+ value: null
+ },
+ ajaxurl: {
+ value: 0
+ },
+ config: {
+ value: 0
+ }
+ }
+});
+
+M.course = M.course || {};
+M.course.init_section_dragdrop = function(params) {
+ new DRAGSECTION(params);
+};
--- /dev/null
+{
+ "moodle-course-dragdrop": {
+ "requires": [
+ "base",
+ "node",
+ "io",
+ "dom",
+ "dd",
+ "dd-scroll",
+ "moodle-core-dragdrop",
+ "moodle-core-notification",
+ "moodle-course-coursebase",
+ "moodle-course-util"
+ ]
+ }
+}
--- /dev/null
+{
+ "name": "moodle-course-formatchooser",
+ "builds": {
+ "moodle-course-formatchooser": {
+ "jsfiles": [
+ "formatchooser.js"
+ ]
+ }
+ }
+}
--- /dev/null
+var FORMATCHOOSER = function() {
+ FORMATCHOOSER.superclass.constructor.apply(this, arguments);
+};
+
+Y.extend(FORMATCHOOSER, Y.Base, {
+ initializer : function(params) {
+ if (params && params.formid) {
+ var updatebut = Y.one('#'+params.formid+' #id_updatecourseformat');
+ var formatselect = Y.one('#'+params.formid+' #id_format');
+ if (updatebut && formatselect) {
+ updatebut.setStyle('display', 'none');
+ formatselect.on('change', function() {
+ updatebut.simulate('click');
+ });
+ }
+ }
+ }
+});
+
+M.course = M.course || {};
+M.course.init_formatchooser = function(params) {
+ return new FORMATCHOOSER(params);
+};
--- /dev/null
+{
+ "moodle-course-formatchooser": {
+ "requires": [
+ "base",
+ "node",
+ "node-event-simulate"
+ ]
+ }
+}
*/
var CSS = {
- PAGECONTENT : 'div#page-content',
+ PAGECONTENT : 'body',
SECTION : 'li.section',
SECTIONMODCHOOSER : 'span.section-modchooser-link',
SITEMENU : 'div.block_site_main_menu',
// The current section ID
sectionid : null,
- // The hidden element holding the jump param
- jumplink : null,
-
initializer : function() {
var dialogue = Y.one('.chooserdialoguebody');
var header = Y.one('.choosertitle');
e.preventDefault();
},
option_selected : function(thisoption) {
- // Add the sectionid to the URL
- this.jumplink.set('value', thisoption.get('value') + '§ion=' + this.sectionid);
+ // Add the sectionid to the URL.
+ this.hiddenRadioValue.setAttrs({
+ name: 'jump',
+ value: thisoption.get('value') + '§ion=' + this.sectionid
+ });
}
},
{
INSTANCENAME : 'span.instancename',
MODINDENTDIV : '.mod-indent',
MODINDENTOUTER : '.mod-indent-outer',
- PAGECONTENT : 'div#page-content',
+ PAGECONTENT : 'body',
SECTIONLI : 'li.section',
SHOW : 'a.'+CSS.SHOW,
SHOWHIDE : 'a.editing_showhide'
continue;
} else if ($ue->timestart and $ue->timeend) {
$period = get_string('periodstartend', 'enrol', array('start'=>userdate($ue->timestart), 'end'=>userdate($ue->timeend)));
- $periodoutside = ($ue->timestart && $ue->timeend && $now < $ue->timestart && $now > $ue->timeend);
+ $periodoutside = ($ue->timestart && $ue->timeend && ($now < $ue->timestart || $now > $ue->timeend));
} else if ($ue->timestart) {
$period = get_string('periodstart', 'enrol', userdate($ue->timestart));
$periodoutside = ($ue->timestart && $now < $ue->timestart);
* @param string|array $modules One or more modules to require
* @param string $function The JS function to call
* @param array $arguments An array of arguments to pass to the function
- * @param string $galleryversion The YUI gallery version of any modules required
+ * @param string $galleryversion Deprecated: The gallery version to use
* @param bool $ondomready If true the call is postponed until the DOM is finished loading
*/
- public function require_yui_module($modules, $function, array $arguments = null, $galleryversion = '2010.04.08-12-35', $ondomready = false) {
+ public function require_yui_module($modules, $function, array $arguments = null, $galleryversion = null, $ondomready = false) {
+ if ($galleryversion != null) {
+ debugging('The galleryversion parameter to yui_module has been deprecated since Moodle 2.3.', DEBUG_DEVELOPER);
+ }
+
$js = new stdClass;
$js->modules = (array)$modules;
$js->function = $function;
$js->arguments = $arguments;
- $js->galleryversion = $galleryversion;
$js->ondomready = $ondomready;
$this->jsyuimodules[] = $js;
}
*/
public function initialise_js(moodle_page $page) {
foreach ($this->jsyuimodules as $js) {
- $page->requires->yui_module($js->modules, $js->function, $js->arguments, $js->galleryversion, $js->ondomready);
+ $page->requires->yui_module($js->modules, $js->function, $js->arguments, null, $js->ondomready);
}
foreach ($this->jsinitcalls as $js) {
$page->requires->js_init_call($js->function, $js->extraarguments, $js->ondomready, $js->module);
* @return string
*/
public function user_roles_and_actions($userid, $roles, $assignableroles, $canassign, $pageurl) {
- $iconenroladd = $this->output->pix_url('t/enroladd');
$iconenrolremove = $this->output->pix_url('t/delete');
- // get list of roles
+
+
+ // Get list of roles.
$rolesoutput = '';
foreach ($roles as $roleid=>$role) {
if ($canassign and (is_siteadmin() or isset($assignableroles[$roleid])) and !$role['unchangeable']) {
}
}
if (!$hasallroles) {
- $url = new moodle_url($pageurl, array('action'=>'assign', 'user'=>$userid));
- $icon = html_writer::empty_tag('img', array('alt'=>get_string('assignroles', 'role'), 'src'=>$iconenroladd));
- $output = html_writer::tag('div', html_writer::link($url, $icon, array('class'=>'assignrolelink', 'title'=>get_string('assignroles', 'role'))), array('class'=>'addrole'));
+ $url = new moodle_url($pageurl, array('action' => 'assign', 'user' => $userid));
+ $roleicon = $this->output->pix_icon('i/assignroles', get_string('assignroles', 'role'));
+ $link = html_writer::link($url, $roleicon, array('class' => 'assignrolelink'));
+ $output = html_writer::tag('div', $link, array('class'=>'addrole'));
}
}
$output .= html_writer::tag('div', $rolesoutput, array('class'=>'roles'));
* @return string
*/
public function user_groups_and_actions($userid, $groups, $allgroups, $canmanagegroups, $pageurl) {
- $iconenroladd = $this->output->pix_url('t/enroladd');
$iconenrolremove = $this->output->pix_url('t/delete');
- $straddgroup = get_string('addgroup', 'group');
+
+ $groupicon = $this->output->pix_icon('i/group', get_string('addgroup', 'group'));
$groupoutput = '';
foreach($groups as $groupid=>$name) {
$groupoutput .= html_writer::tag('div', $name, array('class'=>'group', 'rel'=>$groupid));
}
}
- $groupoutput = html_writer::tag('div', $groupoutput, array('class'=>'groups'));
+ $output = '';
if ($canmanagegroups && (count($groups) < count($allgroups))) {
- $icon = html_writer::empty_tag('img', array('alt'=>$straddgroup, 'src'=>$iconenroladd));
$url = new moodle_url($pageurl, array('action'=>'addmember', 'user'=>$userid));
- $groupoutput .= html_writer::tag('div', html_writer::link($url, $icon), array('class'=>'addgroup'));
+ $output .= html_writer::tag('div', html_writer::link($url, $groupicon), array('class'=>'addgroup'));
}
- return $groupoutput;
+ $output = $output.html_writer::tag('div', $groupoutput, array('class'=>'groups'));
+ return $output;
}
/**
if (allroles) {
this.get(CONTAINER).addClass('hasAllRoles');
} else {
- if (!link) {
- var m = this.get(MANIPULATOR);
- link = Y.Node.create('<div class="addrole"></div>').append(
- Y.Node.create('<img alt="" />').setAttribute('src', M.util.image_url('t/enroladd', 'moodle'))
- );
- link.on('click', m.addRole, m, this);
- this.get(CONTAINER).one('.col_role').insert(link, 0);
- this.set(ASSIGNROLELINK, link);
- }
this.get(CONTAINER).removeClass('hasAllRoles');
}
},
.gradingform_guide .criterion .remark {vertical-align: top;}
.gradingform_guide.editor .criterion .controls,
-.gradingform_guide .criterion .description,
-.gradingform_guide .criterion .remark {padding:3px;}
+.gradingform_guide.editor .criterion .description,
+.gradingform_guide.editor .criterion .remark {padding:3px;}
.gradingform_guide .criteria {height:100%;}
.gradingform_guide .criterion {border:1px solid #DDD;overflow: hidden;}
.gradingform_guide.editor .hiddenelement {display:none;}
.gradingform_guide.editor .pseudotablink {background-color:transparent;border:0 solid;height:1px;width:1px;color:transparent;padding:0;margin:0;position:relative;float:right;}
-.gradingform_guide .markingguidecomment {cursor: pointer;}
-.jsenabled .gradingform_guide .markingguidecomment:before {content: url([[pix:t/add]]);padding-right:2px;}
+.jsenabled .gradingform_guide .markingguidecomment {cursor: pointer;}
+.jsenabled .gradingform_guide .markingguidecomment:before {
+ content: url([[pix:t/add]]);
+ padding-right:2px;
+}
+.dir-rtl.jsenabled .gradingform_guide .markingguidecomment:before {
+ padding-right: 0;
+ padding-left: 2px;
+}
.gradingform_guide .commentheader {font-weight:bold;font-size:1.1em;padding-bottom:5px;}
.jsenabled .gradingform_guide .criterionnamelabel {display: none;}
.jsenabled .gradingform_guide .criterionshortname {font-weight:bold;}
.gradingform_guide table {width: 100%}
+.gradingform_guide .descriptionreadonly {
+ vertical-align: top;
+}
.gradingform_guide .criteriondescriptionmarkers {width: 300px;}
-.gradingform_guide .markingguideremark {width: 100%;}
-.gradingform_guide .criteriondescriptionscore {display: inline;}
\ No newline at end of file
+.gradingform_guide .markingguideremark {
+ margin: 0;
+ width: 100%;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.gradingform_guide .criteriondescriptionscore {display: inline;}
+.gradingform_guide .score label {
+ display: block;
+}
+.gradingform_guide .score input {
+ margin: 0;
+ width: auto;
+}
AND ue.status = :uestatus
AND e.status = :estatus
AND e.courseid = :courseid
+ AND ue.timestart < :now1 AND (ue.timeend = 0 OR ue.timeend > :now2)
GROUP BY ue.userid";
$coursecontext = $this->context->get_course_context(true);
- $params = array_merge($uparams, array('estatus'=>ENROL_INSTANCE_ENABLED, 'uestatus'=>ENROL_USER_ACTIVE, 'courseid'=>$coursecontext->instanceid));
+ $time = time();
+ $params = array_merge($uparams, array('estatus' => ENROL_INSTANCE_ENABLED, 'uestatus' => ENROL_USER_ACTIVE,
+ 'courseid' => $coursecontext->instanceid, 'now1' => $time, 'now2' => $time));
$useractiveenrolments = $DB->get_records_sql($sql, $params);
$defaultgradeshowactiveenrol = !empty($CFG->grade_report_showonlyactiveenrol);
$this->assertEquals($scale->id, $gradeitem->scaleid);
$this->assertEquals($scalestring, $cell->text, "Grade text matches scale");
- // Now change it to no grade.
+ // Now change it to no grade with gradebook feedback enabled.
+ $adminconfig = $assign->get_admin_config();
+ $gradebookplugin = $adminconfig->feedback_plugin_for_gradebook;
+ $gradebookplugin .= '_enabled';
+
$instance = $assign->get_instance();
$instance->grade = 0;
+ $instance->$gradebookplugin = 1;
$instance->instance = $instance->id;
$assign->update_instance($instance);
$this->assertEquals(GRADE_TYPE_TEXT, $gradeitem->gradetype);
$this->assertEquals(null, $gradeitem->scaleid);
$this->assertEquals(' - ', $cell->text, 'Grade text matches empty value of " - "');
+
+ // Now change it to no grade with gradebook feedback disabled.
+ $instance = $assign->get_instance();
+ $instance->grade = 0;
+ $instance->$gradebookplugin = 0;
+ $instance->instance = $instance->id;
+ $assign->update_instance($instance);
+
+ $gradeitem = grade_item::fetch($gradeitemparams);
+ $cell = $column->get_item_cell($gradeitem, array());
+
+ $this->assertEquals(GRADE_TYPE_NONE, $gradeitem->gradetype);
+ $this->assertEquals(null, $gradeitem->scaleid);
}
}
$config->lang = $lang;
if (!empty($_POST)) {
- if (install_ini_get_bool('magic_quotes_gpc')) {
- $_POST = array_map('stripslashes', $_POST);
- }
-
$config->stage = (int)$_POST['stage'];
if (isset($_POST['previous'])) {
defined('MOODLE_INTERNAL') || die();
+$string['cannotcreatedboninstall'] = '<p>Nije moguće kreirati bazu podataka.</p> <p>Određena baza podataka ne postoji i dati korisnik nema dozvolu da kreira bazu podataka.</p> <p>Site administrator bi trebao verificirati postavke baze podataka.</p>';
$string['cannotcreatelangdir'] = 'Nije moguće kreirati direktorij jezika';
$string['cannotcreatetempdir'] = 'Nije moguće kreirati privremeni direktorij';
-$string['cannotdownloadcomponents'] = 'Nije moguće preuzet
