| '.get_string('subcategories').' |
|---|
| ';
- $firstentry = false;
- }
- $catlinkcss = $subcategory->visible ? '' : ' class="dimmed" ';
- echo ''.
- format_string($subcategory->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $subcategory->id))).' '; - } - } - if (!$firstentry) { - echo ' |
"; - $course->summary .= "$strcategory: category\">"; - $course->summary .= $displaylist[$course->category]; - $course->summary .= "
"; + // front page don't belong to any category and block can exist. + if ($course->category > 0) { + $course->summary .= ""; + $course->summary .= "$strcategory: category\">"; + $course->summary .= $displaylist[$course->category]; + $course->summary .= "
"; + } print_course($course, $search); echo $OUTPUT->spacer(array('height'=>5, 'width'=>5, 'br'=>true)); // should be done with CSS instead } - } else { - /// Show editing UI. + } else { //editing mode echo ""; @@ -384,7 +399,7 @@ $defaultperpage = 10; //If user has course:create or category:manage capability the show 30 records. $capabilities = array('moodle/course:create', 'moodle/category:manage'); - if (has_any_capability($capabilities, get_context_instance(CONTEXT_SYSTEM))) { + if (has_any_capability($capabilities, context_system::instance())) { $defaultperpage = 30; } diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index 3a35fd86575..ca4c063d17b 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -22,7 +22,6 @@ require_once $CFG->dirroot.'/grade/report/grader/lib.php'; $courseid = required_param('id', PARAM_INT); // course id $page = optional_param('page', 0, PARAM_INT); // active page -$perpageurl = optional_param('perpage', 0, PARAM_INT); $edit = optional_param('edit', -1, PARAM_BOOL); // sticky editting mode $sortitemid = optional_param('sortitemid', 0, PARAM_ALPHANUM); // sort by which grade item @@ -127,12 +126,6 @@ if ($data = data_submitted() and confirm_sesskey() and has_capability('moodle/gr $warnings = array(); } - -// Override perpage if set in URL -if ($perpageurl) { - $report->user_prefs['studentsperpage'] = $perpageurl; -} - // final grades MUST be loaded after the processing $report->load_users(); $numusers = $report->get_numusers(); @@ -162,6 +155,7 @@ if ($USER->gradeediting[$course->id] && ($report->get_pref('showquickfeedback') echo ''; echo ''; echo ''; + echo ''; echo $reporthtml; echo ''; echo ''; diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 2aea35f324f..d171289e2f8 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -135,12 +135,11 @@ class grade_report_grader extends grade_report { $this->baseurl = new moodle_url('index.php', array('id' => $this->courseid)); - $studentsperpage = $this->get_pref('studentsperpage'); - if (!empty($studentsperpage)) { - $this->baseurl->params(array('perpage' => $studentsperpage, 'page' => $this->page)); + if (!empty($this->page)) { + $this->baseurl->params(array('page' => $this->page)); } - $this->pbarurl = new moodle_url('/grade/report/grader/index.php', array('id' => $this->courseid, 'perpage' => $studentsperpage)); + $this->pbarurl = new moodle_url('/grade/report/grader/index.php', array('id' => $this->courseid)); $this->setup_groups(); diff --git a/group/members.php b/group/members.php index fd53b135f03..587ab4eea62 100644 --- a/group/members.php +++ b/group/members.php @@ -20,7 +20,7 @@ $cancel = optional_param('cancel', false, PARAM_BOOL); $group = $DB->get_record('groups', array('id'=>$groupid), '*', MUST_EXIST); $course = $DB->get_record('course', array('id'=>$group->courseid), '*', MUST_EXIST); -$PAGE->set_url('/groups/members.php', array('id'=>$groupid)); +$PAGE->set_url('/group/members.php', array('group'=>$groupid)); $PAGE->set_pagelayout('standard'); require_login($course); diff --git a/lang/en/blog.php b/lang/en/blog.php index 1d54561d87e..202ad8770c0 100644 --- a/lang/en/blog.php +++ b/lang/en/blog.php @@ -54,6 +54,8 @@ $string['blogentriesbyuseraboutmodule'] = 'Blog entries about this {$a->mod} by $string['blogentrybyuser'] = 'Blog entry by {$a}'; $string['blogpreferences'] = 'Blog preferences'; $string['blogs'] = 'Blogs'; +$string['blogscourse'] = 'Course blogs'; +$string['blogssite'] = 'Site blogs'; $string['blogtags'] = 'Blog tags'; $string['cannotviewcourseblog'] = 'You do not have the required permissions to view blogs in this course'; $string['cannotviewcourseorgroupblog'] = 'You do not have the required permissions to view blogs in this course/group'; diff --git a/lang/en/message.php b/lang/en/message.php index 60993bc4ca6..5aa5f4e6083 100644 --- a/lang/en/message.php +++ b/lang/en/message.php @@ -128,6 +128,7 @@ $string['settings'] = 'Settings'; $string['settingssaved'] = 'Your settings have been saved'; $string['showmessagewindow'] = 'Popup window on new message'; $string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p'; +$string['thisconversation'] = 'this conversation'; $string['timenosee'] = 'Minutes since I was last seen online'; $string['timesent'] = 'Time sent'; $string['touserdoesntexist'] = 'You can not send a message to a user id ({$a}) that doesn\'t exist'; diff --git a/lib/javascript.php b/lib/javascript.php index 02ab49a7f87..59965316bf2 100644 --- a/lib/javascript.php +++ b/lib/javascript.php @@ -46,7 +46,11 @@ foreach ($files as $fsfile) { // does not exist continue; } - if (strpos($jsfile, $CFG->dirroot . DIRECTORY_SEPARATOR) !== 0) { + if ($CFG->dirroot === '/') { + // Some shared hosting sites serve files directly from '/', + // this is NOT supported, but at least allow JS when showing + // errors and warnings. + } else if (strpos($jsfile, $CFG->dirroot . DIRECTORY_SEPARATOR) !== 0) { // hackers - not in dirroot continue; } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 10d13baf8f5..7aea49a9333 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1061,7 +1061,10 @@ class global_navigation extends navigation_node { $mycourses = enrol_get_my_courses(NULL, 'visible DESC,sortorder ASC', $limit); $showallcourses = (count($mycourses) == 0 || !empty($CFG->navshowallcourses)); - $showcategories = ($showallcourses && $this->show_categories()); + // When checking if we are to show categories there is an additional override. + // If the user is viewing a category then we will load it regardless of settings. + // to ensure that the navigation is consistent. + $showcategories = $this->page->context->contextlevel == CONTEXT_COURSECAT || ($showallcourses && $this->show_categories()); $issite = ($this->page->course->id == SITEID); $ismycourse = (array_key_exists($this->page->course->id, $mycourses)); @@ -1086,188 +1089,201 @@ class global_navigation extends navigation_node { $canviewcourseprofile = true; - if (!$issite) { - // Next load context specific content into the navigation - switch ($this->page->context->contextlevel) { - case CONTEXT_SYSTEM : - // This has already been loaded we just need to map the variable - $coursenode = $frontpagecourse; - $this->load_all_categories(null, $showcategories); + // Next load context specific content into the navigation + switch ($this->page->context->contextlevel) { + case CONTEXT_SYSTEM : + // This has already been loaded we just need to map the variable + $coursenode = $frontpagecourse; + $this->load_all_categories(null, $showcategories); + break; + case CONTEXT_COURSECAT : + // This has already been loaded we just need to map the variable + $coursenode = $frontpagecourse; + $this->load_all_categories($this->page->context->instanceid, $showcategories); + if (array_key_exists($this->page->context->instanceid, $this->addedcategories)) { + $this->addedcategories[$this->page->context->instanceid]->make_active(); + } + break; + case CONTEXT_BLOCK : + case CONTEXT_COURSE : + if ($issite) { + // If it is the front page course, or a block on it then + // everything has already been loaded. break; - case CONTEXT_COURSECAT : - // This has already been loaded we just need to map the variable - $coursenode = $frontpagecourse; - $this->load_all_categories($this->page->context->instanceid, $showcategories); + } + // Load the course associated with the page into the navigation + $course = $this->page->course; + if ($showcategories && !$ismycourse) { + $this->load_all_categories($course->category, $showcategories); + } + $coursenode = $this->load_course($course); + + // If the course wasn't added then don't try going any further. + if (!$coursenode) { + $canviewcourseprofile = false; break; - case CONTEXT_BLOCK : - case CONTEXT_COURSE : - // Load the course associated with the page into the navigation - $course = $this->page->course; - if ($showcategories && !$ismycourse) { - $this->load_all_categories($course->category, $showcategories); - } - $coursenode = $this->load_course($course); + } - // If the course wasn't added then don't try going any further. - if (!$coursenode) { - $canviewcourseprofile = false; - break; - } + // If the user is not enrolled then we only want to show the + // course node and not populate it. - // If the user is not enrolled then we only want to show the - // course node and not populate it. - - // Not enrolled, can't view, and hasn't switched roles - if (!can_access_course($course)) { - // TODO: very ugly hack - do not force "parents" to enrol into course their child is enrolled in, - // this hack has been propagated from user/view.php to display the navigation node. (MDL-25805) - $isparent = false; - if ($this->useridtouseforparentchecks) { - if ($this->useridtouseforparentchecks != $USER->id) { - $usercontext = get_context_instance(CONTEXT_USER, $this->useridtouseforparentchecks, MUST_EXIST); - if ($DB->record_exists('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id)) - and has_capability('moodle/user:viewdetails', $usercontext)) { - $isparent = true; - } + // Not enrolled, can't view, and hasn't switched roles + if (!can_access_course($course)) { + // TODO: very ugly hack - do not force "parents" to enrol into course their child is enrolled in, + // this hack has been propagated from user/view.php to display the navigation node. (MDL-25805) + $isparent = false; + if ($this->useridtouseforparentchecks) { + if ($this->useridtouseforparentchecks != $USER->id) { + $usercontext = get_context_instance(CONTEXT_USER, $this->useridtouseforparentchecks, MUST_EXIST); + if ($DB->record_exists('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id)) + and has_capability('moodle/user:viewdetails', $usercontext)) { + $isparent = true; } } - - if (!$isparent) { - $coursenode->make_active(); - $canviewcourseprofile = false; - break; - } - } - // Add the essentials such as reports etc... - $this->add_course_essentials($coursenode, $course); - if ($this->format_display_course_content($course->format)) { - // Load the course sections - $sections = $this->load_course_sections($course, $coursenode); - } - if (!$coursenode->contains_active_node() && !$coursenode->search_for_active_node()) { - $coursenode->make_active(); - } - break; - case CONTEXT_MODULE : - $course = $this->page->course; - $cm = $this->page->cm; - - if ($showcategories && !$ismycourse) { - $this->load_all_categories($course->category, $showcategories); } - // Load the course associated with the page into the navigation - $coursenode = $this->load_course($course); - - // If the course wasn't added then don't try going any further. - if (!$coursenode) { - $canviewcourseprofile = false; - break; - } - - // If the user is not enrolled then we only want to show the - // course node and not populate it. - if (!can_access_course($course)) { + if (!$isparent) { $coursenode->make_active(); $canviewcourseprofile = false; break; } - - $this->add_course_essentials($coursenode, $course); - - // Get section number from $cm (if provided) - we need this - // before loading sections in order to tell it to load this section - // even if it would not normally display (=> it contains only - // a label, which we are now editing) - $sectionnum = isset($cm->sectionnum) ? $cm->sectionnum : 0; - if ($sectionnum) { - // This value has to be stored in a member variable because - // otherwise we would have to pass it through a public API - // to course formats and they would need to change their - // functions to pass it along again... - $this->includesectionnum = $sectionnum; - } else { - $this->includesectionnum = false; - } - - // Load the course sections into the page + } + // Add the essentials such as reports etc... + $this->add_course_essentials($coursenode, $course); + if ($this->format_display_course_content($course->format)) { + // Load the course sections $sections = $this->load_course_sections($course, $coursenode); - if ($course->id != SITEID) { - // Find the section for the $CM associated with the page and collect - // its section number. - if ($sectionnum) { - $cm->sectionnumber = $sectionnum; - } else { - foreach ($sections as $section) { - if ($section->id == $cm->section) { - $cm->sectionnumber = $section->section; - break; - } - } - } + } + if (!$coursenode->contains_active_node() && !$coursenode->search_for_active_node()) { + $coursenode->make_active(); + } + break; + case CONTEXT_MODULE : + if ($issite) { + // If this is the site course then most information will have + // already been loaded. + // However we need to check if there is more content that can + // yet be loaded for the specific module instance. + $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY); + if ($activitynode) { + $this->load_activity($this->page->cm, $this->page->course, $activitynode); + } + break; + } - // Load all of the section activities for the section the cm belongs to. - if (isset($cm->sectionnumber) and !empty($sections[$cm->sectionnumber])) { - list($sectionarray, $activityarray) = $this->generate_sections_and_activities($course); - $activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, $activityarray); - } else { - $activities = array(); - if ($activity = $this->load_stealth_activity($coursenode, get_fast_modinfo($course))) { - // "stealth" activity from unavailable section - $activities[$cm->id] = $activity; + $course = $this->page->course; + $cm = $this->page->cm; + + if ($showcategories && !$ismycourse) { + $this->load_all_categories($course->category, $showcategories); + } + + // Load the course associated with the page into the navigation + $coursenode = $this->load_course($course); + + // If the course wasn't added then don't try going any further. + if (!$coursenode) { + $canviewcourseprofile = false; + break; + } + + // If the user is not enrolled then we only want to show the + // course node and not populate it. + if (!can_access_course($course)) { + $coursenode->make_active(); + $canviewcourseprofile = false; + break; + } + + $this->add_course_essentials($coursenode, $course); + + // Get section number from $cm (if provided) - we need this + // before loading sections in order to tell it to load this section + // even if it would not normally display (=> it contains only + // a label, which we are now editing) + $sectionnum = isset($cm->sectionnum) ? $cm->sectionnum : 0; + if ($sectionnum) { + // This value has to be stored in a member variable because + // otherwise we would have to pass it through a public API + // to course formats and they would need to change their + // functions to pass it along again... + $this->includesectionnum = $sectionnum; + } else { + $this->includesectionnum = false; + } + + // Load the course sections into the page + $sections = $this->load_course_sections($course, $coursenode); + if ($course->id != SITEID) { + // Find the section for the $CM associated with the page and collect + // its section number. + if ($sectionnum) { + $cm->sectionnumber = $sectionnum; + } else { + foreach ($sections as $section) { + if ($section->id == $cm->section) { + $cm->sectionnumber = $section->section; + break; } } + } + + // Load all of the section activities for the section the cm belongs to. + if (isset($cm->sectionnumber) and !empty($sections[$cm->sectionnumber])) { + list($sectionarray, $activityarray) = $this->generate_sections_and_activities($course); + $activities = $this->load_section_activities($sections[$cm->sectionnumber]->sectionnode, $cm->sectionnumber, $activityarray); } else { $activities = array(); - $activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY); - } - if (!empty($activities[$cm->id])) { - // Finally load the cm specific navigaton information - $this->load_activity($cm, $course, $activities[$cm->id]); - // Check if we have an active ndoe - if (!$activities[$cm->id]->contains_active_node() && !$activities[$cm->id]->search_for_active_node()) { - // And make the activity node active. - $activities[$cm->id]->make_active(); + if ($activity = $this->load_stealth_activity($coursenode, get_fast_modinfo($course))) { + // "stealth" activity from unavailable section + $activities[$cm->id] = $activity; } - } else { - //TODO: something is wrong, what to do? (Skodak) } - break; - case CONTEXT_USER : - $course = $this->page->course; - if ($showcategories && !$ismycourse) { - $this->load_all_categories($course->category, $showcategories); - } - // Load the course associated with the user into the navigation - $coursenode = $this->load_course($course); - - // If the course wasn't added then don't try going any further. - if (!$coursenode) { - $canviewcourseprofile = false; - break; - } - - // If the user is not enrolled then we only want to show the - // course node and not populate it. - if (!can_access_course($course)) { - $coursenode->make_active(); - $canviewcourseprofile = false; - break; - } - $this->add_course_essentials($coursenode, $course); - $sections = $this->load_course_sections($course, $coursenode); - break; - } - } else { - // We need to check if the user is viewing a front page module. - // If so then there is potentially more content to load yet for that - // module. - if ($this->page->context->contextlevel == CONTEXT_MODULE) { - $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY); - if ($activitynode) { - $this->load_activity($this->page->cm, $this->page->course, $activitynode); + } else { + $activities = array(); + $activities[$cm->id] = $coursenode->get($cm->id, navigation_node::TYPE_ACTIVITY); } - } + if (!empty($activities[$cm->id])) { + // Finally load the cm specific navigaton information + $this->load_activity($cm, $course, $activities[$cm->id]); + // Check if we have an active ndoe + if (!$activities[$cm->id]->contains_active_node() && !$activities[$cm->id]->search_for_active_node()) { + // And make the activity node active. + $activities[$cm->id]->make_active(); + } + } else { + //TODO: something is wrong, what to do? (Skodak) + } + break; + case CONTEXT_USER : + if ($issite) { + // The users profile information etc is already loaded + // for the front page. + break; + } + $course = $this->page->course; + if ($showcategories && !$ismycourse) { + $this->load_all_categories($course->category, $showcategories); + } + // Load the course associated with the user into the navigation + $coursenode = $this->load_course($course); + + // If the course wasn't added then don't try going any further. + if (!$coursenode) { + $canviewcourseprofile = false; + break; + } + + // If the user is not enrolled then we only want to show the + // course node and not populate it. + if (!can_access_course($course)) { + $coursenode->make_active(); + $canviewcourseprofile = false; + break; + } + $this->add_course_essentials($coursenode, $course); + $sections = $this->load_course_sections($course, $coursenode); + break; } $limit = 20; @@ -1347,7 +1363,9 @@ class global_navigation extends navigation_node { protected function show_categories() { global $CFG, $DB; if ($this->showcategories === null) { - $this->showcategories = !empty($CFG->navshowcategories) && $DB->count_records('course_categories') > 1; + $show = $this->page->context->contextlevel == CONTEXT_COURSECAT; + $show = $show || (!empty($CFG->navshowcategories) && $DB->count_records('course_categories') > 1); + $this->showcategories = $show; } return $this->showcategories; } @@ -2274,7 +2292,7 @@ class global_navigation extends navigation_node { if (($CFG->bloglevel == BLOG_GLOBAL_LEVEL or ($CFG->bloglevel == BLOG_SITE_LEVEL and (isloggedin() and !isguestuser()))) and has_capability('moodle/blog:view', get_context_instance(CONTEXT_SYSTEM))) { $blogsurls = new moodle_url('/blog/index.php', array('courseid' => $filterselect)); - $participants->add(get_string('blogs','blog'), $blogsurls->out()); + $participants->add(get_string('blogscourse','blog'), $blogsurls->out()); } if (!empty($CFG->enablenotes) && (has_capability('moodle/notes:manage', $this->page->context) || has_capability('moodle/notes:view', $this->page->context))) { $participants->add(get_string('notes','notes'), new moodle_url('/notes/index.php', array('filtertype'=>'course', 'filterselect'=>$course->id))); @@ -2339,7 +2357,7 @@ class global_navigation extends navigation_node { and ($CFG->bloglevel == BLOG_GLOBAL_LEVEL or ($CFG->bloglevel == BLOG_SITE_LEVEL and (isloggedin() and !isguestuser()))) and has_capability('moodle/blog:view', get_context_instance(CONTEXT_SYSTEM))) { $blogsurls = new moodle_url('/blog/index.php', array('courseid' => $filterselect)); - $coursenode->add(get_string('blogs','blog'), $blogsurls->out()); + $coursenode->add(get_string('blogssite','blog'), $blogsurls->out()); } // Notes diff --git a/lib/outputlib.php b/lib/outputlib.php index 8feae4c83d5..285085e78eb 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -441,6 +441,12 @@ class theme_config { if (is_readable($rendererfile)) { // may contain core and plugin renderers and renderer factory include_once($rendererfile); + } else { + // check if renderers.php file is missnamed renderer.php + if (is_readable($this->dir.'/renderer.php')) { + debugging('Developer hint: '.$this->dir.'/renderer.php should be renamed to ' . $this->dir."/renderers.php. + See: http://docs.moodle.org/dev/Output_renderers#Theme_renderers.", DEBUG_DEVELOPER); + } } // cascade all layouts properly diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index 240d131d8d1..f7a5e8afd59 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -408,7 +408,7 @@ class page_requirements_manager { array('saving', 'repository'), array('search', 'repository'), array('searching', 'repository'), array('size', 'repository'), array('submit', 'repository'), array('sync', 'repository'), array('title', 'repository'), array('upload', 'repository'), array('uploading', 'repository'), array('xhtmlerror', 'repository'), - array('cancel'), array('chooselicense', 'repository'), array('author', 'repository'), + array('cancel'), array('chooselicense', 'repository'), array('author', 'repository'),array('next', 'moodle'), array('ok', 'moodle'), array('error', 'moodle'), array('info', 'moodle'), array('norepositoriesavailable', 'repository'), array('norepositoriesexternalavailable', 'repository'), array('nofilesattached', 'repository'), array('filepicker', 'repository'), array('nofilesavailable', 'repository'), array('overwrite', 'repository'), diff --git a/lib/searchlib.php b/lib/searchlib.php index 75baa499402..c9512e98fdc 100644 --- a/lib/searchlib.php +++ b/lib/searchlib.php @@ -359,14 +359,14 @@ function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfie /// First of all, search for reasons to switch to standard SQL generation /// Only mysql are supported for now - if ($DB->get_db_family() != 'mysql') { + if ($DB->get_dbfamily() != 'mysql') { return search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield, $userfirstnamefield, $userlastnamefield, $timefield, $instancefield); } /// Some languages don't have "word separators" and MySQL FULLTEXT doesn't perform well with them, so /// switch to standard SQL search generation - if ($DB->get_db_family() == 'mysql') { + if ($DB->get_dbfamily() == 'mysql') { $nonseparatedlangs = array('ja', 'th', 'zh_cn', 'zh_tw'); if (in_array(current_language(), $nonseparatedlangs)) { return search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield, @@ -445,12 +445,12 @@ function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfie $text_sql_string .= ', ' . $metafield; } /// Begin with the AGAINST clause - $text_sql_string .= ') AGAINST (' . "'"; + $text_sql_string .= ') AGAINST ('; /// Add the search terms $text_sql_string .= ':sgt'.$p; $params['sgt'.$p++] = trim($datasearch_clause); /// Close AGAINST clause - $text_sql_string .= "' IN BOOLEAN MODE)"; + $text_sql_string .= " IN BOOLEAN MODE)"; } } /// Now add the metasearch_clause @@ -463,12 +463,12 @@ function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfie } $text_sql_string .= 'MATCH (' . $metafield; /// Begin with the AGAINST clause - $text_sql_string .= ') AGAINST (' . "'"; + $text_sql_string .= ') AGAINST ('; /// Add the search terms $text_sql_string .= ':sgt'.$p; $params['sgt'.$p++] = trim($metasearch_clause); /// Close AGAINST clause - $text_sql_string .= "' IN BOOLEAN MODE)"; + $text_sql_string .= " IN BOOLEAN MODE)"; } } /// Finally add the non-text conditions diff --git a/message/edit.php b/message/edit.php index 17e0e75b222..a231b25553b 100644 --- a/message/edit.php +++ b/message/edit.php @@ -31,12 +31,9 @@ $course = optional_param('course', SITEID, PARAM_INT); // course id (defaults $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications $url = new moodle_url('/message/edit.php'); -if ($userid !== $USER->id) { - $url->param('id', $userid); -} -if ($course != SITEID) { - $url->param('course', $course); -} +$url->param('id', $userid); +$url->param('course', $course); + $PAGE->set_url($url); if (!$course = $DB->get_record('course', array('id' => $course))) { diff --git a/message/lib.php b/message/lib.php index cd4f5242163..01ffd2c765c 100644 --- a/message/lib.php +++ b/message/lib.php @@ -816,6 +816,12 @@ function message_print_recent_conversations($user=null, $showicontext=false) { $conversations = message_get_recent_conversations($user); + // Attach context url information to create the "View this conversation" type links + foreach($conversations as $conversation) { + $conversation->contexturl = new moodle_url("/message/index.php?user2={$conversation->id}"); + $conversation->contexturlname = get_string('thisconversation', 'message'); + } + $showotheruser = true; message_print_recent_messages_table($conversations, $user, $showotheruser, $showicontext); } diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index 3eeb7a4e235..67b7b6da408 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -349,10 +349,10 @@ if ($do_show == 'edit') { echo ''; if ($feedbackitem->required == 1) { $buttontitle = get_string('switch_item_to_not_required', 'feedback'); - $buttonimg = 'pics/required.gif'; + $buttonimg = $OUTPUT->pix_url('required', 'feedback'); } else { $buttontitle = get_string('switch_item_to_required', 'feedback'); - $buttonimg = 'pics/notrequired.gif'; + $buttonimg = $OUTPUT->pix_url('notrequired', 'feedback'); } $urlparams = array('switchitemrequired'=>$feedbackitem->id); $requiredurl = new moodle_url($url, $urlparams); diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 3f46a1054aa..4c836e0d850 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -216,6 +216,7 @@ class feedback_item_multichoice extends feedback_item_base { } public function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { + global $OUTPUT; $sep_dec = get_string('separator_decimal', 'feedback'); if (substr($sep_dec, 0, 2) == '[[') { $sep_dec = FEEDBACK_DECIMAL; @@ -237,7 +238,7 @@ class feedback_item_multichoice extends feedback_item_base { $pixnr = 0; foreach ($analysed_vals as $val) { $intvalue = $pixnr % 10; - $pix = "pics/$intvalue.gif"; + $pix = $OUTPUT->pix_url('multichoice/' . $intvalue, 'feedback'); $pixnr++; $pixwidth = intval($val->quotient * FEEDBACK_MAX_PIX_LENGTH); $quotient = number_format(($val->quotient * 100), 2, $sep_dec, $sep_thous); diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index 9787dcb236a..050f7ebc050 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -192,6 +192,7 @@ class feedback_item_multichoicerated extends feedback_item_base { } public function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { + global $OUTPUT; $sep_dec = get_string('separator_decimal', 'feedback'); if (substr($sep_dec, 0, 2) == '[[') { $sep_dec = FEEDBACK_DECIMAL; @@ -212,7 +213,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $avg = 0.0; foreach ($analysed_vals as $val) { $intvalue = $pixnr % 10; - $pix = "pics/$intvalue.gif"; + $pix = $OUTPUT->pix_url('multichoice/' . $intvalue, 'feedback'); $pixnr++; $pixwidth = intval($val->quotient * FEEDBACK_MAX_PIX_LENGTH); diff --git a/mod/feedback/pics/0.gif b/mod/feedback/pix/multichoice/0.gif similarity index 100% rename from mod/feedback/pics/0.gif rename to mod/feedback/pix/multichoice/0.gif diff --git a/mod/feedback/pics/1.gif b/mod/feedback/pix/multichoice/1.gif similarity index 100% rename from mod/feedback/pics/1.gif rename to mod/feedback/pix/multichoice/1.gif diff --git a/mod/feedback/pics/2.gif b/mod/feedback/pix/multichoice/2.gif similarity index 100% rename from mod/feedback/pics/2.gif rename to mod/feedback/pix/multichoice/2.gif diff --git a/mod/feedback/pics/3.gif b/mod/feedback/pix/multichoice/3.gif similarity index 100% rename from mod/feedback/pics/3.gif rename to mod/feedback/pix/multichoice/3.gif diff --git a/mod/feedback/pics/4.gif b/mod/feedback/pix/multichoice/4.gif similarity index 100% rename from mod/feedback/pics/4.gif rename to mod/feedback/pix/multichoice/4.gif diff --git a/mod/feedback/pics/5.gif b/mod/feedback/pix/multichoice/5.gif similarity index 100% rename from mod/feedback/pics/5.gif rename to mod/feedback/pix/multichoice/5.gif diff --git a/mod/feedback/pics/6.gif b/mod/feedback/pix/multichoice/6.gif similarity index 100% rename from mod/feedback/pics/6.gif rename to mod/feedback/pix/multichoice/6.gif diff --git a/mod/feedback/pics/7.gif b/mod/feedback/pix/multichoice/7.gif similarity index 100% rename from mod/feedback/pics/7.gif rename to mod/feedback/pix/multichoice/7.gif diff --git a/mod/feedback/pics/8.gif b/mod/feedback/pix/multichoice/8.gif similarity index 100% rename from mod/feedback/pics/8.gif rename to mod/feedback/pix/multichoice/8.gif diff --git a/mod/feedback/pics/9.gif b/mod/feedback/pix/multichoice/9.gif similarity index 100% rename from mod/feedback/pics/9.gif rename to mod/feedback/pix/multichoice/9.gif diff --git a/mod/feedback/pics/notrequired.gif b/mod/feedback/pix/notrequired.gif similarity index 100% rename from mod/feedback/pics/notrequired.gif rename to mod/feedback/pix/notrequired.gif diff --git a/mod/feedback/pics/required.gif b/mod/feedback/pix/required.gif similarity index 100% rename from mod/feedback/pics/required.gif rename to mod/feedback/pix/required.gif diff --git a/mod/folder/edit.php b/mod/folder/edit.php index dc66f941c4f..161745c70ef 100644 --- a/mod/folder/edit.php +++ b/mod/folder/edit.php @@ -58,6 +58,7 @@ if ($mform->is_cancelled()) { } else if ($formdata = $mform->get_data()) { $formdata = file_postupdate_standard_filemanager($formdata, 'files', $options, $context, 'mod_folder', 'content', 0); + $DB->set_field('folder', 'revision', $folder->revision+1, array('id'=>$folder->id)); redirect(new moodle_url('/mod/folder/view.php', array('id'=>$cm->id))); } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 90e145c799a..c4b9dd1ed91 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -2882,7 +2882,12 @@ function glossary_comment_validate($comment_param) { if (!$record = $DB->get_record('glossary_entries', array('id'=>$comment_param->itemid))) { throw new comment_exception('invalidcommentitemid'); } - if (!$glossary = $DB->get_record('glossary', array('id'=>$record->glossaryid))) { + if ($record->sourceglossaryid && $record->sourceglossaryid == $comment_param->cm->instance) { + $glossary = $DB->get_record('glossary', array('id'=>$record->sourceglossaryid)); + } else { + $glossary = $DB->get_record('glossary', array('id'=>$record->glossaryid)); + } + if (!$glossary) { throw new comment_exception('invalidid', 'data'); } if (!$course = $DB->get_record('course', array('id'=>$glossary->course))) { diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php index 7ab9d2cd0e7..f9307560885 100644 --- a/mod/lesson/pagetypes/multichoice.php +++ b/mod/lesson/pagetypes/multichoice.php @@ -145,8 +145,7 @@ class lesson_page_type_multichoice extends lesson_page { $answers = $this->get_used_answers(); $ncorrect = 0; $nhits = 0; - $correctresponse = ''; - $wrongresponse = ''; + $responses = array(); $correctanswerid = 0; $wronganswerid = 0; // store student's answers for displaying on feedback page @@ -155,6 +154,9 @@ class lesson_page_type_multichoice extends lesson_page { foreach ($studentanswers as $answerid) { if ($answerid == $answer->id) { $result->studentanswer .= '| {$keyword->label} | + |