From 9b57d5bc38fb4295c237f634ecb8c0960d2fd1b1 Mon Sep 17 00:00:00 2001 From: Aaron Barnes Date: Wed, 11 Apr 2012 18:54:40 +1200 Subject: [PATCH 001/903] MDL-32249 completion: Make grade criteria more consistent Also, round course grades and remove hardcoded string. Note: This patch also removes the ability to update the course grade from the completion interface --- course/completion.php | 10 ---------- course/completion_form.php | 5 ++++- lang/en/completion.php | 4 +++- lib/completion/completion_criteria_grade.php | 25 ++++++++++++++----------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/course/completion.php b/course/completion.php index 3d4e17b..a25c2af 100644 --- a/course/completion.php +++ b/course/completion.php @@ -141,16 +141,6 @@ if ($form->is_cancelled()){ $aggregation->setMethod($data->role_aggregation); $aggregation->save(); - // Update course total passing grade - if (!empty($data->criteria_grade)) { - if ($grade_item = grade_category::fetch_course_category($course->id)->grade_item) { - $grade_item->gradepass = $data->criteria_grade_value; - if (method_exists($grade_item, 'update')) { - $grade_item->update('course/completion.php'); - } - } - } - add_to_log($course->id, 'course', 'completion updated', 'completion.php?id='.$course->id); $url = new moodle_url('/course/view.php', array('id' => $course->id)); diff --git a/course/completion_form.php b/course/completion_form.php index 0a5b543..951776a 100644 --- a/course/completion_form.php +++ b/course/completion_form.php @@ -179,10 +179,13 @@ class course_completion_form extends moodleform { $criteria->config_form_display($mform); // Completion on course grade - $mform->addElement('header', 'grade', get_string('grade')); + $mform->addElement('header', 'grade', get_string('coursegrade', 'completion')); // Grade enable and passing grade $course_grade = $DB->get_field('grade_items', 'gradepass', array('courseid' => $course->id, 'itemtype' => 'course')); + if (!$course_grade) { + $course_grade = '0.00000'; + } $criteria = new completion_criteria_grade($params); $criteria->config_form_display($mform, $course_grade); diff --git a/lang/en/completion.php b/lang/en/completion.php index 0683c79..9a9d10c 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -110,6 +110,7 @@ $string['courseprerequisites']='Course prerequisites'; $string['coursesavailable']='Courses available'; $string['coursesavailableexplaination']='Course completion criteria must be set for a course to appear in this list'; $string['criteria']='Criteria'; +$string['criteriagradenote'] = 'Please note that updating the required grade here will not update the current course pass grade.'; $string['criteriagroup']='Criteria group'; $string['criteriarequiredall']='All criteria below are required'; $string['criteriarequiredany']='Any criteria below are required'; @@ -124,6 +125,8 @@ $string['datepassed']='Date passed'; $string['daysafterenrolment']='Days after enrolment'; $string['durationafterenrolment']='Duration after enrolment'; $string['fraction']='Fraction'; +$string['gradexrequired']='{$a} required'; +$string['graderequired']='Grade required'; $string['inprogress']='In progress'; $string['manualcompletionby']='Manual completion by'; $string['manualselfcompletion']='Manual self completion'; @@ -136,7 +139,6 @@ $string['nocriteriaset']='No completion criteria set for this course'; $string['notenroled']='You are not enrolled in this course'; $string['notyetstarted']='Not yet started'; $string['overallcriteriaaggregation']='Overall criteria type aggregation'; -$string['passinggrade']='Passing grade'; $string['pending']='Pending'; $string['periodpostenrolment']='Period post enrolment'; $string['prerequisites']='Prerequisites'; diff --git a/lib/completion/completion_criteria_grade.php b/lib/completion/completion_criteria_grade.php index 6bc32ed..56a4d0f 100644 --- a/lib/completion/completion_criteria_grade.php +++ b/lib/completion/completion_criteria_grade.php @@ -62,8 +62,9 @@ class completion_criteria_grade extends completion_criteria { */ public function config_form_display(&$mform, $data = null) { $mform->addElement('checkbox', 'criteria_grade', get_string('enable')); - $mform->addElement('text', 'criteria_grade_value', get_string('passinggrade', 'completion')); + $mform->addElement('text', 'criteria_grade_value', get_string('graderequired', 'completion')); $mform->setDefault('criteria_grade_value', $data); + $mform->addElement('static', 'criteria_grade_value_note', '', get_string('criteriagradenote', 'completion')); if ($this->id) { $mform->setDefault('criteria_grade', 1); @@ -128,7 +129,7 @@ class completion_criteria_grade extends completion_criteria { * @return string */ public function get_title() { - return get_string('grade'); + return get_string('coursegrade', 'completion'); } /** @@ -137,7 +138,8 @@ class completion_criteria_grade extends completion_criteria { * @return string */ public function get_title_detailed() { - return (float) $this->gradepass . '% required'; + $graderequired = round($this->gradepass, 2).'%'; + return get_string('gradexrequired', 'completion', $graderequired); } /** @@ -156,15 +158,16 @@ class completion_criteria_grade extends completion_criteria { * @return string */ public function get_status($completion) { - // Cast as floats to get rid of excess decimal places - $grade = (float) $this->get_grade($completion); - $gradepass = (float) $this->gradepass; + $grade = $this->get_grade($completion); + $graderequired = $this->get_title_detailed(); if ($grade) { - return $grade.'% ('.$gradepass.'% to pass)'; + $grade = round($grade, 2).'%'; } else { - return $gradepass.'% to pass'; + $grade = get_string('nograde'); } + + return $grade.' ('.$graderequired.')'; } /** @@ -231,11 +234,11 @@ class completion_criteria_grade extends completion_criteria { public function get_details($completion) { $details = array(); $details['type'] = get_string('coursegrade', 'completion'); - $details['criteria'] = get_string('passinggrade', 'completion'); - $details['requirement'] = ((float)$this->gradepass).'%'; + $details['criteria'] = get_string('graderequired', 'completion'); + $details['requirement'] = round($this->gradepass, 2).'%'; $details['status'] = ''; - $grade = (float)$this->get_grade($completion); + $grade = round($this->get_grade($completion), 2); if ($grade) { $details['status'] = $grade.'%'; } -- 1.7.9.5 From 11824b04617442f8f59fd6754ba31ba1b9bd1eaa Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Tue, 26 Jun 2012 03:40:37 +0100 Subject: [PATCH 002/903] MDL-33987_M23 theme_anomaly: amended some css values to style dock better also removed exclude parent theme stylesheet as it refered to a none existant file in base theme. --- theme/anomaly/config.php | 2 -- theme/anomaly/style/dock.css | 52 ++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/theme/anomaly/config.php b/theme/anomaly/config.php index 6fcbaee..1f32394 100644 --- a/theme/anomaly/config.php +++ b/theme/anomaly/config.php @@ -21,8 +21,6 @@ $THEME->parents = array('base'); // TODO: new themes can not be based on standa /// is not used. //////////////////////////////////////////////////////////////////////////////// -$THEME->parents_exclude_sheets = array('base'=>array('styles_moz')); - $THEME->layouts = array( // Most pages - if we encounter an unknown or a missing page type, this one is used. 'base' => array( diff --git a/theme/anomaly/style/dock.css b/theme/anomaly/style/dock.css index 497cf7c..31bf99e 100644 --- a/theme/anomaly/style/dock.css +++ b/theme/anomaly/style/dock.css @@ -2,23 +2,21 @@ -----------------*/ body.has_dock { - margin:0; + margin: 0; } - #dock { - width:3%; - position:fixed; - top:0px; - right:0; - height:100%; - z-index:11000; + width: 3%; + position: fixed; + top: 0; + left: 0; + height: 100%; + z-index: 11000; background-color: #C8C9C7; border-right: 0 none; } - #dock.nothingdocked { visibility: hidden; - display:none; + display: none; } #dock .controls { bottom: auto; @@ -36,11 +34,11 @@ body.has_dock { #dock .dockeditem { background-color: #C8C9C7; padding: 2px; - padding-right: 0px; + padding-right: 0; } #dock .dockedtitle { - padding-bottom: 5px; - cursor:pointer; + padding-bottom: 8px; + cursor: pointer; background-color: #222; -webkit-border-top-left-radius: 10px; -moz-border-radius-topleft: 10px; @@ -50,13 +48,13 @@ body.has_dock { border-bottom-left-radius: 10px; } #dock .dockedtitle h2 { - margin: 0; - padding: 10px 3px; + margin: 8px 0; + padding: 0 3px; color: #fff; font-family: sans-serif; } .dockedtitle.activeitem h2 { - color: #fff !important; + color: #fff; } #dock .dockedtitle.activeitem { background-color: #697F55; @@ -68,7 +66,7 @@ body.has_dock { border-bottom-left-radius: 10px; } #dock .controls img { - cursor:pointer; + cursor: pointer; margin-left: 10px; } /* @@ -81,11 +79,11 @@ Docked Item Panel left: 100%; } #dockeditempanel.dockitempanel_hidden { - display:none; + display: none; } #dockeditempanel .dockeditempanel_content { background-color: #eee; - margin: 0 3px; + margin: 0 3px 0 0; position: relative; min-height: 100px; border-color: #697F55; @@ -97,7 +95,6 @@ Docked Item Panel -webkit-border-top-left-radius: 0; -moz-border-top-left-radius: 0; border-top-left-radius: 0; - } #dockeditempanel .dockeditempanel_hd { border-color: #eee; @@ -105,7 +102,7 @@ Docked Item Panel padding: 2px; } #dockeditempanel .dockeditempanel_bd .block_docked { - margin:10px; + margin: 10px; } #dockeditempanel .block_calendar_month.block_docked { text-align: center; @@ -117,21 +114,22 @@ Docked Item Panel border-top-right-radius: 10px; } #dockeditempanel .dockeditempanel_hd h2 { - display:inline; + display: inline; margin: 0; padding-right: 2em; color: #000; - float: left; } - #dockeditempanel .dockeditempanel_hd .commands { - display:inline; + display: inline; } #dockeditempanel .dockeditempanel_hd .commands img { margin-right: 3px; vertical-align: middle; } #dockeditempanel .dockeditempanel_bd { - overflow:auto; - width:auto; /* adds scroll to dock panel */ + overflow: auto; + width: auto; /* adds scroll to dock panel */ } +#dockeditempanel .dockeditempanel_bd .block_navigation .block_tree li { + overflow: visible; +} \ No newline at end of file -- 1.7.9.5 From 896f9ae83b3eb3ebe6b1feea4182610328d50aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Tue, 26 Jun 2012 09:12:35 +0200 Subject: [PATCH 003/903] MDL-34019 Fix response item key name --- lib/pluginlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pluginlib.php b/lib/pluginlib.php index 75a8186..43de510 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -811,7 +811,7 @@ class available_update_checker { } if (empty($response['forbranch']) or $response['forbranch'] !== moodle_major_version(true)) { - throw new available_update_checker_exception('err_response_target_version', $response['target']); + throw new available_update_checker_exception('err_response_target_version', $response['forbranch']); } } -- 1.7.9.5 From 3d348a3cc74a16b089884724f905167362059982 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 20 Jun 2012 16:00:54 +0100 Subject: [PATCH 004/903] MDL-32062 question engine: fix re-grading attempts from 2.0 The code to upgrade attempts from before Moodle 2.0 to 2.1 created attempt data that was not exactly the same as a new attempt created in 2.1+. This did not matter very much - revew and the quiz reports all worked OK - but it broke on re-grade. These changes detect the problem data in the re-grade code, an apply a work-around so that the re-grade gives the correct result. --- question/engine/questionattempt.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/question/engine/questionattempt.php b/question/engine/questionattempt.php index 070c4fc..54c4d9f 100644 --- a/question/engine/questionattempt.php +++ b/question/engine/questionattempt.php @@ -1086,15 +1086,32 @@ class question_attempt { $first = true; foreach ($oldqa->get_step_iterator() as $step) { $this->observer->notify_step_deleted($step, $this); + if ($first) { + // First step of the attempt. $first = false; $this->start($oldqa->behaviour, $oldqa->get_variant(), $step->get_all_data(), $step->get_timecreated(), $step->get_user_id(), $step->get_id()); + + } else if ($step->has_behaviour_var('finish') && count($step->get_submitted_data()) > 1) { + // This case relates to MDL-32062. The upgrade code from 2.0 + // generates attempts where the final submit of the question + // data, and the finish action, are in the same step. The system + // cannot cope with that, so convert the single old step into + // two new steps. + $submitteddata = $step->get_submitted_data(); + unset($submitteddata['-finish']); + $this->process_action($submitteddata, + $step->get_timecreated(), $step->get_user_id(), $step->get_id()); + $this->finish($step->get_timecreated(), $step->get_user_id()); + } else { + // This is the normal case. Replay the next step of the attempt. $this->process_action($step->get_submitted_data(), $step->get_timecreated(), $step->get_user_id(), $step->get_id()); } } + if ($finished) { $this->finish(); } -- 1.7.9.5 From 225e058685ffb009e5b43ebe83c92d392fe1d5ff Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 7 Jun 2012 16:40:58 +0100 Subject: [PATCH 005/903] MDL-30883 question flags: aria attributes for accessibility Also, update code to use html_writer, and fix pointer style when not editable. --- question/engine/renderer.php | 50 +++++++++++++++++++++++++++-------------- theme/base/style/question.css | 2 +- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/question/engine/renderer.php b/question/engine/renderer.php index 006729a..dbb1ddd 100644 --- a/question/engine/renderer.php +++ b/question/engine/renderer.php @@ -207,36 +207,52 @@ class core_question_renderer extends plugin_renderer_base { */ protected function question_flag(question_attempt $qa, $flagsoption) { global $CFG; + + $divattributes = array('class' => 'questionflag'); + switch ($flagsoption) { case question_display_options::VISIBLE: $flagcontent = $this->get_flag_html($qa->is_flagged()); break; + case question_display_options::EDITABLE: $id = $qa->get_flag_field_name(); - if ($qa->is_flagged()) { - $checked = 'checked="checked" '; - } else { - $checked = ''; - } - $postdata = question_flags::get_postdata($qa); // The checkbox id must be different from any element name, because // of a stupid IE bug: // http://www.456bereastreet.com/archive/200802/beware_of_id_and_name_attribute_mixups_when_using_getelementbyid_in_internet_explorer/ - $flagcontent = '' . - '' . - '' . - '' . "\n"; + $checkboxattributes = array( + 'type' => 'checkbox', + 'id' => $id . 'checkbox', + 'name' => $id, + 'value' => 1, + ); + if ($qa->is_flagged()) { + $checkboxattributes['checked'] = 'checked'; + } + $postdata = question_flags::get_postdata($qa); + + $flagcontent = html_writer::empty_tag('input', + array('type' => 'hidden', 'name' => $id, 'value' => 0)) . + html_writer::empty_tag('input', $checkboxattributes) . + html_writer::empty_tag('input', + array('type' => 'hidden', 'value' => $postdata, 'class' => 'questionflagpostdata')) . + html_writer::tag('label', $this->get_flag_html($qa->is_flagged(), $id . 'img'), + array('id' => $id . 'label', 'for' => $id . 'checkbox')) . "\n"; + + $divattributes = array( + 'class' => 'questionflag editable', + 'aria-atomic' => 'true', + 'aria-relevant' => 'text', + 'aria-live' => 'assertive', + ); + break; + default: $flagcontent = ''; } - if ($flagcontent) { - return '
' . $flagcontent . "
\n"; - } + + return html_writer::nonempty_tag('div', $flagcontent, $divattributes); } /** diff --git a/theme/base/style/question.css b/theme/base/style/question.css index 33cedb4..3d4a13c 100644 --- a/theme/base/style/question.css +++ b/theme/base/style/question.css @@ -46,7 +46,7 @@ body.jsenabled #qtypechoicecontainer {display: block;} .que h2.no {margin: 0;font-size: 0.8em;line-height: 1;} .que span.qno {font-size: 1.5em;font-weight:bold;} .que .info > div {font-size: 0.8em;margin-top: 0.7em;} -.que .info .questionflag {cursor:pointer;} +.que .info .questionflag.editable {cursor:pointer;} .que .info .editquestion img, .que .info .questionflag img, .que .info .questionflag input {vertical-align: bottom;} -- 1.7.9.5 From 5af6c9676ebd86e390ef71089b210b6ad4dc3de3 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Mon, 18 Jun 2012 13:21:40 +0100 Subject: [PATCH 006/903] MDL-33780 question import: strip UTF8 BOM Previously, if there was a byte-order mark at the start of the file, the import would just break, which was silly. Much better to just strip it off. --- question/format.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/question/format.php b/question/format.php index 2e3e3e2..0ccdbce 100644 --- a/question/format.php +++ b/question/format.php @@ -539,7 +539,10 @@ class qformat_default { if (is_readable($filename)) { $filearray = file($filename); - /// Check for Macintosh OS line returns (ie file on one line), and fix + // If the first line of the file starts with a UTF-8 BOM, remove it. + $filearray[0] = textlib::trim_utf8_bom($filearray[0]); + + // Check for Macintosh OS line returns (ie file on one line), and fix. if (preg_match("~\r~", $filearray[0]) AND !preg_match("~\n~", $filearray[0])) { return explode("\r", $filearray[0]); } else { -- 1.7.9.5 From b0cf55f1453d3d06a62afca0a944a5f955641baa Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Mon, 25 Jun 2012 15:15:20 +0100 Subject: [PATCH 007/903] MDL-34008 formslib: repeat_elements replace {no} for submits & buttons --- lib/formslib.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/formslib.php b/lib/formslib.php index ac28eb8..306c4e5 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -944,6 +944,9 @@ abstract class moodleform { $value = $elementclone->_text; $elementclone->setValue(str_replace('{no}', ($i+1), $value)); + } else if (is_a($elementclone, 'HTML_QuickForm_submit') || is_a($elementclone, 'HTML_QuickForm_button')) { + $elementclone->setValue(str_replace('{no}', ($i+1), $elementclone->getValue())); + } else { $value=$elementclone->getLabel(); $elementclone->setLabel(str_replace('{no}', ($i+1), $value)); -- 1.7.9.5 From d81d6ea2c3e792e32f59c6fb4a28cd608e03903e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Fri, 22 Jun 2012 15:22:27 +0200 Subject: [PATCH 008/903] MDL-33453 Make it clear what search_references() and search_references_count() are good for Initially it was not clear enough that these two methods are supposed to be used for looking for references to a stored_file only. So the docs comments are improved and unittests added to illustrate the usage. The patch also removes the unittest for get_references_by_storedfile() as its usage is already covered in other test methods. --- lib/filestorage/file_storage.php | 27 ++++++++- lib/filestorage/tests/file_storage_test.php | 84 +++++++++++++++++++++------ 2 files changed, 91 insertions(+), 20 deletions(-) diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 933c5c3..2b248d1 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -1656,6 +1656,7 @@ class file_storage { * * @param string $str * @param bool $cleanparams if set to true, array elements will be passed through {@link clean_param()} + * @throws file_reference_exception if the $str does not have the expected format * @return array */ public static function unpack_reference($str, $cleanparams = false) { @@ -1681,7 +1682,13 @@ class file_storage { } /** - * Returns all aliases that link to an external file identified by the given reference + * Returns all aliases that refer to some stored_file via the given reference + * + * All repositories that provide access to a stored_file are expected to use + * {@link self::pack_reference()}. This method can't be used if the given reference + * does not use this format or if you are looking for references to an external file + * (for example it can't be used to search for all aliases that refer to a given + * Dropbox or Box.net file). * * Aliases in user draft areas are excluded from the returned list. * @@ -1695,6 +1702,10 @@ class file_storage { throw new coding_exception('NULL is not a valid reference to an external file'); } + // Give {@link self::unpack_reference()} a chance to throw exception if the + // reference is not in a valid format. + self::unpack_reference($reference); + $referencehash = sha1($reference); $sql = "SELECT ".self::instance_sql_fields('f', 'r')." @@ -1714,7 +1725,13 @@ class file_storage { } /** - * Returns the number of aliases that link to an external file identified by the given reference + * Returns the number of aliases that refer to some stored_file via the given reference + * + * All repositories that provide access to a stored_file are expected to use + * {@link self::pack_reference()}. This method can't be used if the given reference + * does not use this format or if you are looking for references to an external file + * (for example it can't be used to count aliases that refer to a given Dropbox or + * Box.net file). * * Aliases in user draft areas are not counted. * @@ -1728,6 +1745,10 @@ class file_storage { throw new coding_exception('NULL is not a valid reference to an external file'); } + // Give {@link self::unpack_reference()} a chance to throw exception if the + // reference is not in a valid format. + self::unpack_reference($reference); + $referencehash = sha1($reference); $sql = "SELECT COUNT(f.id) @@ -1737,7 +1758,7 @@ class file_storage { WHERE r.referencehash = ? AND (f.component <> ? OR f.filearea <> ?)"; - return $DB->count_records_sql($sql, array($referencehash, 'user', 'draft')); + return (int)$DB->count_records_sql($sql, array($referencehash, 'user', 'draft')); } /** diff --git a/lib/filestorage/tests/file_storage_test.php b/lib/filestorage/tests/file_storage_test.php index d787bba..dfc4fa0 100644 --- a/lib/filestorage/tests/file_storage_test.php +++ b/lib/filestorage/tests/file_storage_test.php @@ -400,16 +400,6 @@ class filestoragelib_testcase extends advanced_testcase { $this->assertFalse($doesntexist); } - public function test_get_references_by_storedfile() { - $user = $this->setup_three_private_files(); - $fs = get_file_storage(); - - $areafiles = $fs->get_area_files($user->ctxid, 'user', 'private'); - $testfile = reset($areafiles); - $references = $fs->get_references_by_storedfile($testfile); - // TODO MDL-33368 Verify result!! - } - public function test_get_external_files() { $user = $this->setup_three_private_files(); $fs = get_file_storage(); @@ -583,15 +573,75 @@ class filestoragelib_testcase extends advanced_testcase { } public function test_search_references() { + $user = $this->setup_three_private_files(); $fs = get_file_storage(); - $references = $fs->search_references('testsearch'); - // TODO MDL-33368 Verify result!! - } + $repos = repository::get_instances(array('type'=>'user')); + $repo = reset($repos); - public function test_search_references_count() { - $fs = get_file_storage(); - $references = $fs->search_references_count('testsearch'); - // TODO MDL-33368 Verify result!! + $alias1 = array( + 'contextid' => $user->ctxid, + 'component' => 'user', + 'filearea' => 'private', + 'itemid' => 0, + 'filepath' => '/aliases/', + 'filename' => 'alias-to-1.txt' + ); + + $alias2 = array( + 'contextid' => $user->ctxid, + 'component' => 'user', + 'filearea' => 'private', + 'itemid' => 0, + 'filepath' => '/aliases/', + 'filename' => 'another-alias-to-1.txt' + ); + + $reference = file_storage::pack_reference(array( + 'contextid' => $user->ctxid, + 'component' => 'user', + 'filearea' => 'private', + 'itemid' => 0, + 'filepath' => '/', + 'filename' => '1.txt' + )); + + // There are no aliases now. + $result = $fs->search_references($reference); + $this->assertEquals(array(), $result); + + $result = $fs->search_references_count($reference); + $this->assertSame($result, 0); + + // Create two aliases and make sure they are returned. + $fs->create_file_from_reference($alias1, $repo->id, $reference); + $fs->create_file_from_reference($alias2, $repo->id, $reference); + + $result = $fs->search_references($reference); + $this->assertTrue(is_array($result)); + $this->assertEquals(count($result), 2); + foreach ($result as $alias) { + $this->assertTrue($alias instanceof stored_file); + } + + $result = $fs->search_references_count($reference); + $this->assertSame($result, 2); + + // The method can't be used for references to files outside the filepool + $exceptionthrown = false; + try { + $fs->search_references('http://dl.dropbox.com/download/1234567/naked-dougiamas.jpg'); + } catch (file_reference_exception $e) { + $exceptionthrown = true; + } + $this->assertTrue($exceptionthrown); + + $exceptionthrown = false; + try { + $fs->search_references_count('http://dl.dropbox.com/download/1234567/naked-dougiamas.jpg'); + } catch (file_reference_exception $e) { + $exceptionthrown = true; + } + $this->assertTrue($exceptionthrown); } public function test_delete_area_files() { -- 1.7.9.5 From 2670a3a6849b552479469043fec3d5a0e9c9e22f Mon Sep 17 00:00:00 2001 From: Aaron Barnes Date: Wed, 27 Jun 2012 10:38:24 +1200 Subject: [PATCH 009/903] MDL-34044 completion: Fix regression caused by MDL-26626 --- blocks/completionstatus/block_completionstatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 07a7b47..0daec7c 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -171,7 +171,7 @@ class block_completionstatus extends block_base { $a = new stdClass(); $a->first = $prerequisites_complete; $a->second = count($prerequisites); - $shtml .= get_string('firstofsecond', 'block_completionstatus', $a); + $phtml .= get_string('firstofsecond', 'block_completionstatus', $a); $phtml .= ''; $shtml = $phtml . $shtml; -- 1.7.9.5 From fc14c79fc9815aff333221f670da51b1d07ed5ef Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Mon, 30 Apr 2012 11:12:20 +0800 Subject: [PATCH 010/903] MDL-32605 calendar: Fixing the missing parameter for get_string call --- calendar/delete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/delete.php b/calendar/delete.php index 24edd48..e79e945 100644 --- a/calendar/delete.php +++ b/calendar/delete.php @@ -108,7 +108,7 @@ $repeatspan = ''; if (!empty($event->eventrepeats) && $event->eventrepeats > 0) { $url = new moodle_url(CALENDAR_URL.'delete.php', array('id'=>$event->repeatid, 'confirm'=>true, 'repeats'=>true)); $buttons .= $OUTPUT->single_button($url, get_string('deleteall')); - $repeatspan = '

'.get_string('youcandeleteallrepeats', 'calendar').''; + $repeatspan = '

'.get_string('youcandeleteallrepeats', 'calendar', $event->eventrepeats).''; } // And add the cancel button -- 1.7.9.5 From faca7084844ff3b73c44fe81c3e2e7da9ed8388b Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 27 Jun 2012 14:31:03 +0800 Subject: [PATCH 011/903] MDL-34025 - quiz secure window: fix popup closing --- mod/quiz/accessmanager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/quiz/accessmanager.php b/mod/quiz/accessmanager.php index 9c0f148..11efebd 100644 --- a/mod/quiz/accessmanager.php +++ b/mod/quiz/accessmanager.php @@ -445,7 +445,7 @@ class quiz_access_manager { */ public function back_to_view_page($output, $message = '') { if ($this->attempt_must_be_in_popup()) { - echo $output->close_attempt_popup($message, $this->quizobj->view_url()); + echo $output->close_attempt_popup($this->quizobj->view_url(), $message); die(); } else { redirect($this->quizobj->view_url(), $message); -- 1.7.9.5 From e5ff0d32785690bf243668a35fd2c05b3ef7b6ab Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 20 Jun 2012 23:38:05 +0100 Subject: [PATCH 012/903] MDL-33924 quiz: incorrect foreign key definition. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Jean-Michel Vedrine for spotting this.≈ --- mod/quiz/db/install.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/quiz/db/install.xml b/mod/quiz/db/install.xml index 0c15b60..fd12420 100644 --- a/mod/quiz/db/install.xml +++ b/mod/quiz/db/install.xml @@ -74,7 +74,7 @@ - + -- 1.7.9.5 From a44c303d636badaedbcbd6999c0dae07d4c6c97f Mon Sep 17 00:00:00 2001 From: Adam Olley Date: Tue, 28 Feb 2012 16:28:11 +1030 Subject: [PATCH 013/903] MDL-31802: Remove section summaries from navigation_cache --- lib/navigationlib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 58629dd..41e5d2a 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1924,6 +1924,8 @@ class global_navigation extends navigation_node { $activities = array(); foreach ($sections as $key => $section) { + $sections[$key] = clone($section); + unset($sections[$key]->summary); $sections[$key]->hasactivites = false; if (!array_key_exists($section->section, $modinfo->sections)) { continue; -- 1.7.9.5 From 37817a0cd88cebc47917d507e7017addd92ff500 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 28 Jun 2012 12:11:18 +0800 Subject: [PATCH 014/903] MDL-34077 Repositories: Flickr and Picasa can have custom names --- repository/flickr/lib.php | 2 ++ repository/picasa/lib.php | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/repository/flickr/lib.php b/repository/flickr/lib.php index 6886638..b1c5463 100644 --- a/repository/flickr/lib.php +++ b/repository/flickr/lib.php @@ -277,6 +277,8 @@ class repository_flickr extends repository { $secret = ''; } + parent::type_config_form($mform); + $strrequired = get_string('required'); $mform->addElement('text', 'api_key', get_string('apikey', 'repository_flickr'), array('value'=>$api_key,'size' => '40')); $mform->addElement('text', 'secret', get_string('secret', 'repository_flickr'), array('value'=>$secret,'size' => '40')); diff --git a/repository/picasa/lib.php b/repository/picasa/lib.php index 7dbdf7b..642c7b3 100644 --- a/repository/picasa/lib.php +++ b/repository/picasa/lib.php @@ -98,9 +98,6 @@ class repository_picasa extends repository { return parent::logout(); } - public function get_name() { - return get_string('pluginname', 'repository_picasa'); - } public function supported_filetypes() { return array('web_image'); } -- 1.7.9.5 From b574c078a6fd0e61826b15415ee8f73a3cb9c73a Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Fri, 29 Jun 2012 11:37:01 +0800 Subject: [PATCH 015/903] MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. --- admin/tool/customlang/db/upgrade.php | 4 ++++ auth/manual/db/upgrade.php | 4 ++++ auth/mnet/db/upgrade.php | 4 ++++ blocks/community/db/upgrade.php | 4 ++++ blocks/html/db/upgrade.php | 4 ++++ blocks/navigation/db/upgrade.php | 4 ++++ blocks/settings/db/upgrade.php | 4 ++++ enrol/authorize/db/upgrade.php | 4 ++++ enrol/database/db/upgrade.php | 4 ++++ enrol/flatfile/db/upgrade.php | 4 ++++ enrol/guest/db/upgrade.php | 4 ++++ enrol/imsenterprise/db/upgrade.php | 4 ++++ enrol/mnet/db/upgrade.php | 4 ++++ enrol/paypal/db/upgrade.php | 4 ++++ filter/mediaplugin/db/upgrade.php | 4 ++++ filter/tex/db/upgrade.php | 4 ++++ grade/grading/form/rubric/db/upgrade.php | 4 ++++ lib/db/upgrade.php | 4 ++++ message/output/email/db/upgrade.php | 4 ++++ message/output/jabber/db/upgrade.php | 4 ++++ message/output/popup/db/upgrade.php | 4 ++++ mod/assign/db/upgrade.php | 4 ++++ mod/assign/feedback/comments/db/upgrade.php | 4 ++++ mod/assign/feedback/file/db/upgrade.php | 4 ++++ mod/assign/submission/comments/db/upgrade.php | 4 ++++ mod/assign/submission/file/db/upgrade.php | 4 ++++ mod/assign/submission/onlinetext/db/upgrade.php | 4 ++++ mod/assignment/db/upgrade.php | 4 ++++ mod/book/db/upgrade.php | 4 ++++ mod/chat/db/upgrade.php | 4 ++++ mod/choice/db/upgrade.php | 4 ++++ mod/data/db/upgrade.php | 4 ++++ mod/feedback/db/upgrade.php | 4 ++++ mod/folder/db/upgrade.php | 4 ++++ mod/forum/db/upgrade.php | 4 ++++ mod/glossary/db/upgrade.php | 4 ++++ mod/imscp/db/upgrade.php | 4 ++++ mod/label/db/upgrade.php | 4 ++++ mod/lesson/db/upgrade.php | 4 ++++ mod/lti/db/upgrade.php | 4 ++++ mod/page/db/upgrade.php | 4 ++++ mod/quiz/db/upgrade.php | 4 ++++ mod/quiz/report/overview/db/upgrade.php | 4 ++++ mod/quiz/report/statistics/db/upgrade.php | 4 ++++ mod/resource/db/upgrade.php | 4 ++++ mod/scorm/db/upgrade.php | 4 ++++ mod/survey/db/upgrade.php | 4 ++++ mod/url/db/upgrade.php | 4 ++++ mod/wiki/db/upgrade.php | 4 ++++ mod/workshop/db/upgrade.php | 4 ++++ mod/workshop/form/accumulative/db/upgrade.php | 4 ++++ mod/workshop/form/comments/db/upgrade.php | 4 ++++ mod/workshop/form/numerrors/db/upgrade.php | 4 ++++ mod/workshop/form/rubric/db/upgrade.php | 4 ++++ portfolio/googledocs/db/upgrade.php | 4 ++++ portfolio/picasa/db/upgrade.php | 4 ++++ question/type/calculated/db/upgrade.php | 4 ++++ question/type/essay/db/upgrade.php | 4 ++++ question/type/match/db/upgrade.php | 4 ++++ question/type/multianswer/db/upgrade.php | 4 ++++ question/type/multichoice/db/upgrade.php | 4 ++++ question/type/numerical/db/upgrade.php | 4 ++++ repository/googledocs/db/upgrade.php | 4 ++++ repository/picasa/db/upgrade.php | 4 ++++ theme/formal_white/db/upgrade.php | 4 ++++ 65 files changed, 260 insertions(+) diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php index efe645e..07c7e3b 100644 --- a/admin/tool/customlang/db/upgrade.php +++ b/admin/tool/customlang/db/upgrade.php @@ -30,5 +30,9 @@ function xmldb_tool_customlang_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php index 82aab0a..46fd720 100644 --- a/auth/manual/db/upgrade.php +++ b/auth/manual/db/upgrade.php @@ -33,5 +33,9 @@ function xmldb_auth_manual_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php index fa5d157..d10cda5 100644 --- a/auth/mnet/db/upgrade.php +++ b/auth/mnet/db/upgrade.php @@ -34,5 +34,9 @@ function xmldb_auth_mnet_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php index e3eb9a4..53e2222 100644 --- a/blocks/community/db/upgrade.php +++ b/blocks/community/db/upgrade.php @@ -46,5 +46,9 @@ function xmldb_block_community_upgrade($oldversion) { global $CFG, $DB; + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php index 8eec672..54bb53d 100644 --- a/blocks/html/db/upgrade.php +++ b/blocks/html/db/upgrade.php @@ -32,5 +32,9 @@ function xmldb_block_html_upgrade($oldversion) { global $CFG, $DB; + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php index 4ad9818..32c5d8d 100644 --- a/blocks/navigation/db/upgrade.php +++ b/blocks/navigation/db/upgrade.php @@ -58,5 +58,9 @@ function xmldb_block_navigation_upgrade($oldversion, $block) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } \ No newline at end of file diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php index 65c265c..feb241a 100644 --- a/blocks/settings/db/upgrade.php +++ b/blocks/settings/db/upgrade.php @@ -58,5 +58,9 @@ function xmldb_block_settings_upgrade($oldversion, $block) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } \ No newline at end of file diff --git a/enrol/authorize/db/upgrade.php b/enrol/authorize/db/upgrade.php index 9a11f48..ad71ff7 100644 --- a/enrol/authorize/db/upgrade.php +++ b/enrol/authorize/db/upgrade.php @@ -26,5 +26,9 @@ function xmldb_enrol_authorize_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php index c21880c..7aae081 100644 --- a/enrol/database/db/upgrade.php +++ b/enrol/database/db/upgrade.php @@ -30,5 +30,9 @@ function xmldb_enrol_database_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php index b8e4a73..67785c2 100644 --- a/enrol/flatfile/db/upgrade.php +++ b/enrol/flatfile/db/upgrade.php @@ -32,5 +32,9 @@ function xmldb_enrol_flatfile_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php index b19b5a6..b14e8f8 100644 --- a/enrol/guest/db/upgrade.php +++ b/enrol/guest/db/upgrade.php @@ -40,6 +40,10 @@ function xmldb_enrol_guest_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2011112901, 'enrol', 'guest'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php index a348d69..39b8fdc 100644 --- a/enrol/imsenterprise/db/upgrade.php +++ b/enrol/imsenterprise/db/upgrade.php @@ -31,6 +31,10 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php index 6564435..8c70236 100644 --- a/enrol/mnet/db/upgrade.php +++ b/enrol/mnet/db/upgrade.php @@ -32,5 +32,9 @@ function xmldb_enrol_mnet_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php index b66c655..8bcb41f 100644 --- a/enrol/paypal/db/upgrade.php +++ b/enrol/paypal/db/upgrade.php @@ -47,5 +47,9 @@ function xmldb_enrol_paypal_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php index c77415f..a9c7964 100644 --- a/filter/mediaplugin/db/upgrade.php +++ b/filter/mediaplugin/db/upgrade.php @@ -54,5 +54,9 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2011121200, 'filter', 'mediaplugin'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php index fea5c3d..74b0ef5 100644 --- a/filter/tex/db/upgrade.php +++ b/filter/tex/db/upgrade.php @@ -33,5 +33,9 @@ function xmldb_filter_tex_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php index e60160d..7c1d214 100644 --- a/grade/grading/form/rubric/db/upgrade.php +++ b/grade/grading/form/rubric/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_gradingform_rubric_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 3be8b80..dd52946 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -872,5 +872,9 @@ function xmldb_main_upgrade($oldversion) { } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php index dd79b5c..da3d22a 100644 --- a/message/output/email/db/upgrade.php +++ b/message/output/email/db/upgrade.php @@ -36,6 +36,10 @@ function xmldb_message_email_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/message/output/jabber/db/upgrade.php b/message/output/jabber/db/upgrade.php index d884f25..eb78904 100644 --- a/message/output/jabber/db/upgrade.php +++ b/message/output/jabber/db/upgrade.php @@ -36,6 +36,10 @@ function xmldb_message_jabber_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index 63a4f73..ef556ee 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -36,6 +36,10 @@ function xmldb_message_popup_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php index e918367..de7a154 100644 --- a/mod/assign/db/upgrade.php +++ b/mod/assign/db/upgrade.php @@ -47,6 +47,10 @@ function xmldb_assign_upgrade($oldversion) { upgrade_mod_savepoint(true, 2012051700, 'assign'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php index 9321ecc..97409c6 100644 --- a/mod/assign/feedback/comments/db/upgrade.php +++ b/mod/assign/feedback/comments/db/upgrade.php @@ -29,6 +29,10 @@ */ function xmldb_assignfeedback_comments_upgrade($oldversion) { // do the upgrades + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/feedback/file/db/upgrade.php b/mod/assign/feedback/file/db/upgrade.php index cf6594e..e59722d 100644 --- a/mod/assign/feedback/file/db/upgrade.php +++ b/mod/assign/feedback/file/db/upgrade.php @@ -29,6 +29,10 @@ */ function xmldb_assignfeedback_file_upgrade($oldversion) { // do the upgrades + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/submission/comments/db/upgrade.php b/mod/assign/submission/comments/db/upgrade.php index 6bc5bce..565fc0f 100644 --- a/mod/assign/submission/comments/db/upgrade.php +++ b/mod/assign/submission/comments/db/upgrade.php @@ -28,6 +28,10 @@ * @return bool */ function xmldb_assignsubmission_comments_upgrade($oldversion) { + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/submission/file/db/upgrade.php b/mod/assign/submission/file/db/upgrade.php index b00f57b..a86a5fb 100644 --- a/mod/assign/submission/file/db/upgrade.php +++ b/mod/assign/submission/file/db/upgrade.php @@ -28,6 +28,10 @@ * @return bool */ function xmldb_assignsubmission_file_upgrade($oldversion) { + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assign/submission/onlinetext/db/upgrade.php b/mod/assign/submission/onlinetext/db/upgrade.php index 183e602..056c0bb 100644 --- a/mod/assign/submission/onlinetext/db/upgrade.php +++ b/mod/assign/submission/onlinetext/db/upgrade.php @@ -28,6 +28,10 @@ * @return bool */ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) { + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php index 6608b6c..d9c46ea 100644 --- a/mod/assignment/db/upgrade.php +++ b/mod/assignment/db/upgrade.php @@ -29,6 +29,10 @@ function xmldb_assignment_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php index 735116c..3fb1085 100644 --- a/mod/book/db/upgrade.php +++ b/mod/book/db/upgrade.php @@ -37,5 +37,9 @@ function xmldb_book_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php index 2b9ad1d..c716494 100644 --- a/mod/chat/db/upgrade.php +++ b/mod/chat/db/upgrade.php @@ -29,6 +29,10 @@ function xmldb_chat_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php index f86bbe4..e46ab79 100644 --- a/mod/choice/db/upgrade.php +++ b/mod/choice/db/upgrade.php @@ -29,6 +29,10 @@ function xmldb_choice_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php index a84c883..745d0cb 100644 --- a/mod/data/db/upgrade.php +++ b/mod/data/db/upgrade.php @@ -29,6 +29,10 @@ function xmldb_data_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php index c4ededd..fd0d9a5 100644 --- a/mod/feedback/db/upgrade.php +++ b/mod/feedback/db/upgrade.php @@ -43,6 +43,10 @@ function xmldb_feedback_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php index 7a2b6e2..d996b61 100644 --- a/mod/folder/db/upgrade.php +++ b/mod/folder/db/upgrade.php @@ -55,5 +55,9 @@ function xmldb_folder_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php index d493b2b..4c2f297 100644 --- a/mod/forum/db/upgrade.php +++ b/mod/forum/db/upgrade.php @@ -50,6 +50,10 @@ function xmldb_forum_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php index ccebcd2..48e85b8 100644 --- a/mod/glossary/db/upgrade.php +++ b/mod/glossary/db/upgrade.php @@ -44,6 +44,10 @@ function xmldb_glossary_upgrade($oldversion) { upgrade_mod_savepoint(true, 2012022000, 'glossary'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php index 2b027f7..e4c4b0a 100644 --- a/mod/imscp/db/upgrade.php +++ b/mod/imscp/db/upgrade.php @@ -35,5 +35,9 @@ function xmldb_imscp_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php index 0511d0f..a083759 100644 --- a/mod/label/db/upgrade.php +++ b/mod/label/db/upgrade.php @@ -55,6 +55,10 @@ function xmldb_label_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php index 04b0b8f..0cc8e03 100644 --- a/mod/lesson/db/upgrade.php +++ b/mod/lesson/db/upgrade.php @@ -61,6 +61,10 @@ function xmldb_lesson_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php index 2b5f1bc..9fd4e13 100644 --- a/mod/lti/db/upgrade.php +++ b/mod/lti/db/upgrade.php @@ -68,6 +68,10 @@ function xmldb_lti_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php index 4a81df9..b1c4e91 100644 --- a/mod/page/db/upgrade.php +++ b/mod/page/db/upgrade.php @@ -55,5 +55,9 @@ function xmldb_page_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php index d3a8e72..b0a4a4f 100644 --- a/mod/quiz/db/upgrade.php +++ b/mod/quiz/db/upgrade.php @@ -327,6 +327,10 @@ function xmldb_quiz_upgrade($oldversion) { upgrade_mod_savepoint(true, 2012040206, 'quiz'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php index eefc978..f8aa7c8 100644 --- a/mod/quiz/report/overview/db/upgrade.php +++ b/mod/quiz/report/overview/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_quiz_overview_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line. // Put any upgrade step following this. + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php index f3a7871..144d95a 100644 --- a/mod/quiz/report/statistics/db/upgrade.php +++ b/mod/quiz/report/statistics/db/upgrade.php @@ -63,6 +63,10 @@ function xmldb_quiz_statistics_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012061801, 'quiz', 'statistics'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php index fc6245e..383e888 100644 --- a/mod/resource/db/upgrade.php +++ b/mod/resource/db/upgrade.php @@ -55,5 +55,9 @@ function xmldb_resource_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php index a7bcbd7..a85397f 100644 --- a/mod/scorm/db/upgrade.php +++ b/mod/scorm/db/upgrade.php @@ -60,6 +60,10 @@ function xmldb_scorm_upgrade($oldversion) { upgrade_mod_savepoint(true, 2012032101, 'scorm'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php index 3a10f28..10c6ef8 100644 --- a/mod/survey/db/upgrade.php +++ b/mod/survey/db/upgrade.php @@ -29,6 +29,10 @@ function xmldb_survey_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php index 88e0ba0..5449ecb 100644 --- a/mod/url/db/upgrade.php +++ b/mod/url/db/upgrade.php @@ -55,5 +55,9 @@ function xmldb_url_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php index c8ac218..9925711 100644 --- a/mod/wiki/db/upgrade.php +++ b/mod/wiki/db/upgrade.php @@ -45,5 +45,9 @@ function xmldb_wiki_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php index 6f848b9..061d599 100644 --- a/mod/workshop/db/upgrade.php +++ b/mod/workshop/db/upgrade.php @@ -87,5 +87,9 @@ function xmldb_workshop_upgrade($oldversion) { upgrade_mod_savepoint(true, 2012041701, 'workshop'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php index 5ff3a28..fd8065d 100644 --- a/mod/workshop/form/accumulative/db/upgrade.php +++ b/mod/workshop/form/accumulative/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php index 07100d5..a369ae9 100644 --- a/mod/workshop/form/comments/db/upgrade.php +++ b/mod/workshop/form/comments/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_workshopform_comments_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php index 3da3066..459abbb 100644 --- a/mod/workshop/form/numerrors/db/upgrade.php +++ b/mod/workshop/form/numerrors/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php index 62927bf..968f8e5 100644 --- a/mod/workshop/form/rubric/db/upgrade.php +++ b/mod/workshop/form/rubric/db/upgrade.php @@ -38,5 +38,9 @@ function xmldb_workshopform_rubric_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php index 01420b5..39164bf 100644 --- a/portfolio/googledocs/db/upgrade.php +++ b/portfolio/googledocs/db/upgrade.php @@ -39,6 +39,10 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012053001, 'portfolio', 'googledocs'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/portfolio/picasa/db/upgrade.php b/portfolio/picasa/db/upgrade.php index 38df9d5..cb1eeb7 100644 --- a/portfolio/picasa/db/upgrade.php +++ b/portfolio/picasa/db/upgrade.php @@ -39,6 +39,10 @@ function xmldb_portfolio_picasa_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012053001, 'portfolio', 'picasa'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php index f141e02..3d7bc0c 100644 --- a/question/type/calculated/db/upgrade.php +++ b/question/type/calculated/db/upgrade.php @@ -40,6 +40,10 @@ function xmldb_qtype_calculated_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php index 6d60323..0441751 100644 --- a/question/type/essay/db/upgrade.php +++ b/question/type/essay/db/upgrade.php @@ -90,6 +90,10 @@ function xmldb_qtype_essay_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2011102702, 'qtype', 'essay'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php index 6277068..b99732c 100644 --- a/question/type/match/db/upgrade.php +++ b/question/type/match/db/upgrade.php @@ -40,5 +40,9 @@ function xmldb_qtype_match_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php index 8c7e04e..a83470f 100644 --- a/question/type/multianswer/db/upgrade.php +++ b/question/type/multianswer/db/upgrade.php @@ -40,5 +40,9 @@ function xmldb_qtype_multianswer_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php index 41b56bf..48b658f 100644 --- a/question/type/multichoice/db/upgrade.php +++ b/question/type/multichoice/db/upgrade.php @@ -40,5 +40,9 @@ function xmldb_qtype_multichoice_upgrade($oldversion) { // Moodle v2.2.0 release upgrade line // Put any upgrade step following this + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php index 43db9a6..3336f4d 100644 --- a/question/type/numerical/db/upgrade.php +++ b/question/type/numerical/db/upgrade.php @@ -37,5 +37,9 @@ function xmldb_qtype_numerical_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php index 80a77a6..7c78301 100644 --- a/repository/googledocs/db/upgrade.php +++ b/repository/googledocs/db/upgrade.php @@ -42,6 +42,10 @@ function xmldb_repository_googledocs_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012053000, 'repository', 'googledocs'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/repository/picasa/db/upgrade.php b/repository/picasa/db/upgrade.php index 1cd2f2a..3d50bba 100644 --- a/repository/picasa/db/upgrade.php +++ b/repository/picasa/db/upgrade.php @@ -42,6 +42,10 @@ function xmldb_repository_picasa_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012053000, 'repository', 'picasa'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } diff --git a/theme/formal_white/db/upgrade.php b/theme/formal_white/db/upgrade.php index aeb58d2..fccbb15 100644 --- a/theme/formal_white/db/upgrade.php +++ b/theme/formal_white/db/upgrade.php @@ -76,5 +76,9 @@ function xmldb_theme_formal_white_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2012051503, 'theme', 'formal_white'); } + // Moodle v2.3.0 release upgrade line + // Put any upgrade step following this + + return true; } \ No newline at end of file -- 1.7.9.5 From 3e0b5f78a28ed9950e1dd968c192e605310e9aef Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Fri, 29 Jun 2012 14:17:56 +0800 Subject: [PATCH 016/903] MDL-32297 Forms: Date Picker JS popup is not constraint to parent form --- lib/form/yui/dateselector/dateselector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/form/yui/dateselector/dateselector.js b/lib/form/yui/dateselector/dateselector.js index 371e82f..d403547 100644 --- a/lib/form/yui/dateselector/dateselector.js +++ b/lib/form/yui/dateselector/dateselector.js @@ -222,7 +222,7 @@ YUI.add('moodle-form-dateselector', function(Y) { }, fix_position : function() { if (this.currentowner) { - this.panel.set('constrain', this.currentowner.get('node').ancestor('form')); + this.panel.set('constrain', Y.one(document.body)); this.panel.set('align', { node:this.currentowner.get('node').one('select'), points:[Y.WidgetPositionAlign.BL, Y.WidgetPositionAlign.TL] -- 1.7.9.5 From 263e8c144cd6ce05abfddbf131b9fa0fbbdcace7 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 30 Jun 2012 00:50:34 +0100 Subject: [PATCH 017/903] MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css --- theme/splash/config.php | 36 +++++++++++++++++++++++------------- theme/splash/layout/general.php | 8 ++++++-- theme/splash/layout/report.php | 8 ++++++-- theme/splash/lib.php | 11 ----------- theme/splash/style/pagelayout.css | 3 +-- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/theme/splash/config.php b/theme/splash/config.php index f9bca28d..fbdedaf 100644 --- a/theme/splash/config.php +++ b/theme/splash/config.php @@ -33,10 +33,10 @@ $THEME->sheets = array( 'pagelayout', 'core', 'menus', - 'red', - 'green', - 'blue', 'orange', + 'blue', + 'green', + 'red', 'settings', ); @@ -53,48 +53,57 @@ $THEME->layouts = array( 'standard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), // Course page 'course' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), // Course page 'coursecategory' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'incourse' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'frontpage' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'admin' => array( 'file' => 'general.php', 'regions' => array('side-pre'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'mydashboard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'mypublic' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'login' => array( 'file' => 'general.php', - 'regions' => array() + 'regions' => array(), + 'options' => array('langmenu'=>true), ), // Pages that appear in pop-up windows - no navigation, no blocks, no header. 'popup' => array( @@ -137,7 +146,8 @@ $THEME->layouts = array( 'report' => array( 'file' => 'report.php', 'regions' => array('side-pre'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), ); diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php index 4763983..0b94083 100644 --- a/theme/splash/layout/general.php +++ b/theme/splash/layout/general.php @@ -32,7 +32,6 @@ $custommenu = $OUTPUT->custom_menu(); $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); splash_check_colourswitch(); -splash_initialise_colourswitcher($PAGE); $bodyclasses = array(); $bodyclasses[] = 'splash-'.splash_get_colour(); @@ -107,7 +106,12 @@ echo $OUTPUT->doctype() ?> alt="orange" /> - lang_menu();?> + layout_options['langmenu'])) { + echo $OUTPUT->lang_menu(); + } + echo $PAGE->headingmenu + ?>
custom_menu(); $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); splash_check_colourswitch(); -splash_initialise_colourswitcher($PAGE); $bodyclasses = array(); $bodyclasses[] = 'splash-'.splash_get_colour(); @@ -107,7 +106,12 @@ echo $OUTPUT->doctype() ?> alt="orange" />
- lang_menu();?> + layout_options['langmenu'])) { + echo $OUTPUT->lang_menu(); + } + echo $PAGE->headingmenu + ?>
requires->yui_module('moodle-theme_splash-colourswitcher', - 'M.theme_splash.initColourSwitcher', array(array('div'=>'#colourswitcher'))); -} - -/** * Gets the colour the user has selected, or the default if they have never changed * * @param string $default The default colour to use, normally red diff --git a/theme/splash/style/pagelayout.css b/theme/splash/style/pagelayout.css index bfb4f6e..eca577c 100644 --- a/theme/splash/style/pagelayout.css +++ b/theme/splash/style/pagelayout.css @@ -199,7 +199,6 @@ p.prolog a:link { margin:10px 0 0 15px; } .logininfo{ - background:url([[pix:theme|loginicon]]) left no-repeat; color:#fff; margin:0; padding:10px 10px 10px 40px; @@ -213,7 +212,7 @@ p.prolog a:link { } #headermenu .langmenu{ position:relative; - top:35px; + top:30px; width:210px; } a, -- 1.7.9.5 From f8e05deb354d062b373319cb4dda6b0d50f53062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 07:50:38 +0200 Subject: [PATCH 018/903] MDL-34045 fix invalid idnumber field type in cohort form --- cohort/edit_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cohort/edit_form.php b/cohort/edit_form.php index 249212c..d449980 100644 --- a/cohort/edit_form.php +++ b/cohort/edit_form.php @@ -49,7 +49,7 @@ class cohort_edit_form extends moodleform { $mform->addElement('select', 'contextid', get_string('context', 'role'), $options); $mform->addElement('text', 'idnumber', get_string('idnumber', 'cohort'), 'maxlength="254" size="50"'); - $mform->setType('name', PARAM_RAW); // idnumbers are plain text, must not be changed + $mform->setType('idnumber', PARAM_RAW); // idnumbers are plain text, must not be changed $mform->addElement('editor', 'description_editor', get_string('description', 'cohort'), null, $editoroptions); $mform->setType('description_editor', PARAM_RAW); -- 1.7.9.5 From b273b20a7cff97b5a25a9f3c276e2def44e14441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 08:09:56 +0200 Subject: [PATCH 019/903] MDL-34115 fix sorting in blocks admin UI Comparison of arrays is not locale aware. --- admin/blocks.php | 23 +++++++++++++++-------- lib/tests/textlib_test.php | 6 ++++++ lib/textlib.class.php | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/admin/blocks.php b/admin/blocks.php index b1c53df..34e8e4e 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -131,12 +131,25 @@ $table->setup(); $tablerows = array(); + // Sort blocks using current locale. + $blocknames = array(); foreach ($blocks as $blockid=>$block) { $blockname = $block->name; + if (file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) { + $blocknames[$blockid] = get_string('pluginname', 'block_'.$blockname); + } else { + $blocknames[$blockid] = $blockname; + } + } + collatorlib::asort($blocknames); + + foreach ($blocknames as $blockid=>$strblockname) { + $block = $blocks[$blockid]; + $blockname = $block->name; if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) { $blockobject = false; - $strblockname = ''.$blockname.' ('.get_string('missingfromdisk').')'; + $strblockname = ''.$strblockname.' ('.get_string('missingfromdisk').')'; $plugin = new stdClass(); $plugin->version = $block->version; @@ -151,7 +164,6 @@ $incompatible[] = $block; continue; } - $strblockname = get_string('pluginname', 'block_'.$blockname); } $delete = ''.$strdelete.''; @@ -222,12 +234,7 @@ $delete, $settings ); - $tablerows[] = array(strip_tags($strblockname), $row); // first element will be used for sorting - } - - collatorlib::asort($tablerows); - foreach ($tablerows as $row) { - $table->add_data($row[1]); + $table->add_data($row); } $table->print_html(); diff --git a/lib/tests/textlib_test.php b/lib/tests/textlib_test.php index 116f313..261cfdd 100644 --- a/lib/tests/textlib_test.php +++ b/lib/tests/textlib_test.php @@ -471,6 +471,12 @@ class collatorlib_testcase extends basic_testcase { $this->assertSame(array_keys($arr), array(0, 'b', 1)); $this->assertTrue($result); + // test sorting of array of arrays - first element should be used for actual comparison + $arr = array(0=>array('bb', 'z'), 1=>array('ab', 'a'), 2=>array('zz', 'x')); + $result = collatorlib::asort($arr, collatorlib::SORT_REGULAR); + $this->assertSame(array_keys($arr), array(1, 0, 2)); + $this->assertTrue($result); + $arr = array('a' => 'áb', 'b' => 'ab', 1 => 'aa', 0=>'cc', 'x' => 'Áb',); $result = collatorlib::asort($arr); $this->assertSame(array_values($arr), array('aa', 'ab', 'áb', 'Áb', 'cc'), $this->error); diff --git a/lib/textlib.class.php b/lib/textlib.class.php index 540e4a4..77fafc1 100644 --- a/lib/textlib.class.php +++ b/lib/textlib.class.php @@ -616,7 +616,7 @@ class textlib { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class collatorlib { - /** @const compare items as strings, equivalent to Collator::SORT_REGULAR */ + /** @const compare items using general PHP comparison, equivalent to Collator::SORT_REGULAR, this may bot be locale aware! */ const SORT_REGULAR = 0; /** @const compare items as strings, equivalent to Collator::SORT_STRING */ -- 1.7.9.5 From 4aabce216c424461cf2bcccba270708eaef6fc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 08:42:16 +0200 Subject: [PATCH 020/903] MDL-33876 skip deleted users in enrol_database sync --- enrol/database/lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/enrol/database/lib.php b/enrol/database/lib.php index d95acb2..1755a89 100644 --- a/enrol/database/lib.php +++ b/enrol/database/lib.php @@ -445,8 +445,9 @@ class enrol_database_plugin extends enrol_plugin { $sql = $this->db_get_sql($table, array($coursefield=>$course->mapping), $sqlfields); if ($rs = $extdb->Execute($sql)) { if (!$rs->EOF) { + $usersearch = array('deleted' => 0); if ($localuserfield === 'username') { - $usersearch = array('mnethostid'=>$CFG->mnet_localhost_id, 'deleted' =>0); + $usersearch['mnethostid'] = $CFG->mnet_localhost_id; } while ($fields = $rs->FetchRow()) { $fields = array_change_key_case($fields, CASE_LOWER); -- 1.7.9.5 From 5cb477c4a11d0fa24bc535abef4364f86fe9c1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 08:55:39 +0200 Subject: [PATCH 021/903] MDL-34120 do not try to create new passwords for incorrectly deleted users There is still some code that ignores delete_user() and instead hacks the user table directly, skip the borked user records for now when sending new passwords. --- lib/cronlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cronlib.php b/lib/cronlib.php index b034760..c51fef1 100644 --- a/lib/cronlib.php +++ b/lib/cronlib.php @@ -212,7 +212,7 @@ function cron_run() { p.id as prefid FROM {user} u JOIN {user_preferences} p ON u.id=p.userid - WHERE p.name='create_password' AND p.value='1' AND u.email !='' AND u.suspended = 0 AND u.auth != 'nologin'"); + WHERE p.name='create_password' AND p.value='1' AND u.email !='' AND u.suspended = 0 AND u.auth != 'nologin' AND u.deleted = 0"); // note: we can not send emails to suspended accounts foreach ($newusers as $newuser) { -- 1.7.9.5 From 3705a88629ce209aef8bb2dfb62c870efafe8867 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 30 Jun 2012 12:02:22 +0100 Subject: [PATCH 022/903] MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php --- theme/splash/config.php | 2 + theme/splash/javascript/colourswitcher.js | 63 +++++++++++++++++++++++++++++ theme/splash/layout/general.php | 1 + theme/splash/layout/report.php | 1 + theme/splash/lib.php | 13 ++++++ 5 files changed, 80 insertions(+) create mode 100644 theme/splash/javascript/colourswitcher.js diff --git a/theme/splash/config.php b/theme/splash/config.php index fbdedaf..c428ce5 100644 --- a/theme/splash/config.php +++ b/theme/splash/config.php @@ -152,3 +152,5 @@ $THEME->layouts = array( ); $THEME->csspostprocess = 'splash_process_css'; + +$THEME->javascripts = array('colourswitcher'); diff --git a/theme/splash/javascript/colourswitcher.js b/theme/splash/javascript/colourswitcher.js new file mode 100644 index 0000000..578f96b --- /dev/null +++ b/theme/splash/javascript/colourswitcher.js @@ -0,0 +1,63 @@ +YUI.add('moodle-theme_splash-colourswitcher', function(Y) { + +// Available colours +var COLOURS = ['red','green','blue','orange']; + +/** + * Splash theme colour switcher class. + * Initialise this class by calling M.theme_splash.init + */ +var ColourSwitcher = function() { + ColourSwitcher.superclass.constructor.apply(this, arguments); +}; +ColourSwitcher.prototype = { + /** + * Constructor for this class + * @param {object} config + */ + initializer : function(config) { + var i, c; + // Attach events to the links to change colours so we can do it with + // JavaScript without refreshing the page + for (i in COLOURS) { + c = COLOURS[i]; + // Check if this is the current colour + if (Y.one(document.body).hasClass('splash-'+c)) { + this.set('colour', c); + } + Y.all(config.div+' .colour-'+c).on('click', this.setColour, this, c); + } + }, + /** + * Sets the colour being used for the splash theme + * @param {Y.Event} e The event that fired + * @param {string} colour The new colour + */ + setColour : function(e, colour) { + // Prevent the event from refreshing the page + e.preventDefault(); + // Switch over the CSS classes on the body + Y.one(document.body).replaceClass('splash-'+this.get('colour'), 'splash-'+colour); + // Update the current colour + this.set('colour', colour); + // Store the users selection (Uses AJAX to save to the database) + M.util.set_user_preference('theme_splash_chosen_colour', colour); + } +}; +// Make the colour switcher a fully fledged YUI module +Y.extend(ColourSwitcher, Y.Base, ColourSwitcher.prototype, { + NAME : 'Splash theme colour switcher', + ATTRS : { + colour : { + value : 'red' + } + } +}); +// Our splash theme namespace +M.theme_splash = M.theme_splash || {}; +// Initialisation function for the colour switcher +M.theme_splash.initColourSwitcher = function(cfg) { + return new ColourSwitcher(cfg); +} + +}, '@VERSION@', {requires:['base','node']}); diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php index 0b94083..3def7ed 100644 --- a/theme/splash/layout/general.php +++ b/theme/splash/layout/general.php @@ -32,6 +32,7 @@ $custommenu = $OUTPUT->custom_menu(); $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); splash_check_colourswitch(); +splash_initialise_colourswitcher($PAGE); $bodyclasses = array(); $bodyclasses[] = 'splash-'.splash_get_colour(); diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php index 20a9775..10d7390 100644 --- a/theme/splash/layout/report.php +++ b/theme/splash/layout/report.php @@ -32,6 +32,7 @@ $custommenu = $OUTPUT->custom_menu(); $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); splash_check_colourswitch(); +splash_initialise_colourswitcher($PAGE); $bodyclasses = array(); $bodyclasses[] = 'splash-'.splash_get_colour(); diff --git a/theme/splash/lib.php b/theme/splash/lib.php index 5aeb7db..f9f1fb6 100644 --- a/theme/splash/lib.php +++ b/theme/splash/lib.php @@ -88,6 +88,19 @@ function splash_set_customcss($css, $customcss) { } /** + * Adds the JavaScript for the colour switcher to the page. + * + * The colour switcher is a YUI moodle module that is located in + * theme/splash/yui/splash/splash.js + * + * @param moodle_page $page + */ +function splash_initialise_colourswitcher(moodle_page $page) { + user_preference_allow_ajax_update('theme_splash_chosen_colour', PARAM_ALPHA); + $page->requires->yui_module('moodle-theme_splash-colourswitcher', 'M.theme_splash.initColourSwitcher', array(array('div'=>'#colourswitcher'))); +} + +/** * Gets the colour the user has selected, or the default if they have never changed * * @param string $default The default colour to use, normally red -- 1.7.9.5 From 93fd7cb10cc9dca86b03443a9ec8661be754eecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 13:57:55 +0200 Subject: [PATCH 023/903] MDL-34121 drop unused backup tables that were supposed to be dropped long ago The backup/restore leftovers that referenced these will be dropped in 2.4 --- lib/db/install.xml | 32 ++------------------------------ lib/db/upgrade.php | 23 +++++++++++++++++++++++ version.php | 2 +- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/lib/db/install.xml b/lib/db/install.xml index 38ef87e..1d88b4d 100644 --- a/lib/db/install.xml +++ b/lib/db/install.xml @@ -2410,7 +2410,7 @@ - +
@@ -2421,35 +2421,7 @@
- - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- +
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 3be8b80..b737428 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -871,6 +871,29 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2012062000.01); } + if ($oldversion < 2012062500.01) { + // Drop some old backup tables, not used anymore + + // Define table backup_files to be dropped + $table = new xmldb_table('backup_files'); + + // Conditionally launch drop table for backup_files + if ($dbman->table_exists($table)) { + $dbman->drop_table($table); + } + + // Define table backup_ids to be dropped + $table = new xmldb_table('backup_ids'); + + // Conditionally launch drop table for backup_ids + if ($dbman->table_exists($table)) { + $dbman->drop_table($table); + } + + // Main savepoint reached + upgrade_main_savepoint(true, 2012062500.01); + } + return true; } diff --git a/version.php b/version.php index 6739bbe..0a9d706 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062500.00; // 2012062500 = branching date YYYYMMDD - do not modify! +$version = 2012062500.01; // 2012062500 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches // .XX = incremental changes -- 1.7.9.5 From 5df5bcba99340ae837ff13a62741eda0e65e2432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 15:39:12 +0200 Subject: [PATCH 024/903] MDL-34036 fix course role user selector --- user/filters/courserole.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/user/filters/courserole.php b/user/filters/courserole.php index 49cb54c..a38fe41 100644 --- a/user/filters/courserole.php +++ b/user/filters/courserole.php @@ -84,7 +84,7 @@ class user_filter_courserole extends user_filter_type { function get_sql_filter($data) { global $CFG, $DB; static $counter = 0; - $name = 'ex_courserole'.$counter++; + $pref = 'ex_courserole'.($counter++).'_'; $value = $data['value']; $roleid = $data['roleid']; @@ -98,17 +98,16 @@ class user_filter_courserole extends user_filter_type { $where = "b.contextlevel=50"; if ($roleid) { - $where .= " AND a.roleid = :roleid"; - $params['roleid'] = $roleid; - + $where .= " AND a.roleid = :{$pref}roleid"; + $params[$pref.'roleid'] = $roleid; } if ($categoryid) { - $where .= " AND c.category = :categoryid"; - $params['categoryid'] = $categoryid; + $where .= " AND c.category = :{$pref}categoryid"; + $params[$pref.'categoryid'] = $categoryid; } if ($value) { - $where .= " AND c.shortname = :$name"; - $params[$name] = $value; + $where .= " AND c.shortname = :{$pref}course"; + $params[$pref.'course'] = $value; } return array("id IN (SELECT userid FROM {role_assignments} a -- 1.7.9.5 From 134affd943a5f129d67c0350d48cca74b93c6a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sat, 30 Jun 2012 20:46:04 +0200 Subject: [PATCH 025/903] MDL-34123 use user's lang when sending new emails --- lib/cronlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cronlib.php b/lib/cronlib.php index b034760..98c8f2d 100644 --- a/lib/cronlib.php +++ b/lib/cronlib.php @@ -208,7 +208,7 @@ function cron_run() { if ($DB->count_records('user_preferences', array('name'=>'create_password', 'value'=>'1'))) { mtrace('Creating passwords for new users...'); $newusers = $DB->get_recordset_sql("SELECT u.id as id, u.email, u.firstname, - u.lastname, u.username, + u.lastname, u.username, u.lang, p.id as prefid FROM {user} u JOIN {user_preferences} p ON u.id=p.userid -- 1.7.9.5 From 8b3d60557c062bb332058abc8765ddd8ebfa9b98 Mon Sep 17 00:00:00 2001 From: Sun Zhigang Date: Tue, 22 May 2012 19:36:50 +0800 Subject: [PATCH 026/903] MDL-31201 wiki: fix a hardcoded string --- mod/wiki/lang/en/wiki.php | 1 + mod/wiki/parser/markups/wikimarkup.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/wiki/lang/en/wiki.php b/mod/wiki/lang/en/wiki.php index 4815ba3..9781d7b 100644 --- a/mod/wiki/lang/en/wiki.php +++ b/mod/wiki/lang/en/wiki.php @@ -195,6 +195,7 @@ $string['searchcontent'] = 'Search in page content'; $string['searchresult'] = 'Search results:'; $string['searchwikis'] = 'Search wikis'; $string['special'] = 'Special'; +$string['tableofcontents'] = 'Table of contents'; $string['tagsdeleted'] = 'Wiki tags have been deleted'; $string['tagtitle'] = 'See the "{$a}" tag'; $string['teacherrating'] = 'Teacher rating'; diff --git a/mod/wiki/parser/markups/wikimarkup.php b/mod/wiki/parser/markups/wikimarkup.php index 30976db..cf7a2b3 100644 --- a/mod/wiki/parser/markups/wikimarkup.php +++ b/mod/wiki/parser/markups/wikimarkup.php @@ -239,7 +239,7 @@ abstract class wiki_markup_parser extends generic_parser { $i++; } - $this->returnvalues['toc'] = "

Table of contents

$toc
"; + $this->returnvalues['toc'] = "

" . get_string('tableofcontents', 'wiki') . "

$toc
"; } /** -- 1.7.9.5 From 43fb824bd23bd59661538c49f7a3e469f53198e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 10:04:54 +0200 Subject: [PATCH 027/903] MDL-34125 fix regression when deleting activity modules Credit goes to Gordon Bateson. --- lib/adminlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index 4aff653..5062c99 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -452,7 +452,7 @@ function get_used_table_names() { if ($loaded and $tables = $structure->getTables()) { foreach($tables as $table) { - $table_names[] = strtolower($table->name); + $table_names[] = strtolower($table->getName()); } } } -- 1.7.9.5 From 9ee97228bdf1d7c658fe470a7d92a4221104addf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 13:30:59 +0200 Subject: [PATCH 028/903] MDL-34130 fix data inserts in recordset tests --- lib/dml/tests/dml_test.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index e431b91..fcbffce 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -921,12 +921,12 @@ class dml_testcase extends database_driver_testcase { $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); $dbman->create_table($table); - $data = array(array('id' => 1, 'course' => 3, 'name' => 'record1', 'onetext'=>'abc'), - array('id' => 2, 'course' => 3, 'name' => 'record2', 'onetext'=>'abcd'), - array('id' => 3, 'course' => 5, 'name' => 'record3', 'onetext'=>'abcde')); + $data = array(array('course' => 3, 'name' => 'record1', 'onetext'=>'abc'), + array('course' => 3, 'name' => 'record2', 'onetext'=>'abcd'), + array('course' => 5, 'name' => 'record3', 'onetext'=>'abcde')); - foreach ($data as $record) { - $DB->insert_record($tablename, $record); + foreach ($data as $key=>$record) { + $data[$key]['id'] = $DB->insert_record($tablename, $record); } // standard recordset iteration @@ -1009,11 +1009,11 @@ class dml_testcase extends database_driver_testcase { $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); $dbman->create_table($table); - $data = array(array('id'=> 1, 'course' => 3, 'name' => 'record1'), - array('id'=> 2, 'course' => 3, 'name' => 'record2'), - array('id'=> 3, 'course' => 5, 'name' => 'record3')); - foreach ($data as $record) { - $DB->insert_record($tablename, $record); + $data = array(array('course' => 3, 'name' => 'record1'), + array('course' => 3, 'name' => 'record2'), + array('course' => 5, 'name' => 'record3')); + foreach ($data as $key=>$record) { + $data[$key]['id'] = $DB->insert_record($tablename, $record); } // Test repeated numeric keys are returned ok -- 1.7.9.5 From 1cf431a3291f710c1cf17095105b0e31175b679d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 13:34:22 +0200 Subject: [PATCH 029/903] MDL-34130 test nested recordset iteration --- lib/dml/tests/dml_test.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index fcbffce..acecb7b 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -990,6 +990,22 @@ class dml_testcase extends database_driver_testcase { $this->assertEquals($e->errorcode, 'textconditionsnotallowed'); } + // Test nested iteration. + $rs1 = $DB->get_recordset($tablename); + $i = 0; + foreach($rs1 as $record1) { + $rs2 = $DB->get_recordset($tablename); + $i++; + $j = 0; + foreach($rs2 as $record2) { + $j++; + } + $rs2->close(); + $this->assertEquals($j, count($data)); + } + $rs1->close(); + $this->assertEquals($i, count($data)); + // notes: // * limits are tested in test_get_recordset_sql() // * where_clause() is used internally and is tested in test_get_records() -- 1.7.9.5 From a61e8c8ebe806433bf4e21c367779c2ec2c3d86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 13:43:55 +0200 Subject: [PATCH 030/903] MDL-34130 test interaction of recordsets and transactions --- lib/dml/tests/dml_test.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index acecb7b..15b52f2 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -4144,6 +4144,42 @@ class dml_testcase extends database_driver_testcase { $this->assertEquals(0, $DB->count_records($tablename)); // finally rolled back $DB->delete_records($tablename); + + // Test interactions of recordset and transactions - this causes problems in SQL Server. + $table2 = $this->get_test_table('2'); + $tablename2 = $table2->getName(); + + $table2->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null); + $table2->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0'); + $table2->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $dbman->create_table($table2); + + $DB->insert_record($tablename, array('course'=>1)); + $DB->insert_record($tablename, array('course'=>2)); + $DB->insert_record($tablename, array('course'=>3)); + + $DB->insert_record($tablename2, array('course'=>5)); + $DB->insert_record($tablename2, array('course'=>6)); + $DB->insert_record($tablename2, array('course'=>7)); + $DB->insert_record($tablename2, array('course'=>8)); + + $rs1 = $DB->get_recordset($tablename); + $i = 0; + foreach ($rs1 as $record1) { + $i++; + $rs2 = $DB->get_recordset($tablename2); + $j = 0; + foreach ($rs2 as $record2) { + $t = $DB->start_delegated_transaction(); + $DB->set_field($tablename, 'course', $record1->course+1, array('id'=>$record1->id)); + $DB->set_field($tablename2, 'course', $record2->course+1, array('id'=>$record2->id)); + $t->allow_commit(); + $j++; + } + $this->assertEquals(4, $j); + } + $rs1->close(); + $this->assertEquals(3, $i); } function test_transactions_forbidden() { -- 1.7.9.5 From a2b8856558be1ed0f5b381a8cb6ee819f806f82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 21:00:16 +0200 Subject: [PATCH 031/903] MDL-34130 add missing rs close Thanks Eloy! --- lib/dml/tests/dml_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index 15b52f2..652d022 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -4176,6 +4176,7 @@ class dml_testcase extends database_driver_testcase { $t->allow_commit(); $j++; } + $rs2->close(); $this->assertEquals(4, $j); } $rs1->close(); -- 1.7.9.5 From d0812ba0e6989c83900fd719942cba1a6fdb4d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 21:35:37 +0200 Subject: [PATCH 032/903] MDL-34130 test recordset data is static We do not want recordset results to be affected by subsequent update or delete queries. --- lib/dml/tests/dml_test.php | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index 652d022..9099445 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -1011,6 +1011,58 @@ class dml_testcase extends database_driver_testcase { // * where_clause() is used internally and is tested in test_get_records() } + public function test_get_recordset_static() { + $DB = $this->tdb; + $dbman = $DB->get_manager(); + + $table = $this->get_test_table(); + $tablename = $table->getName(); + + $table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null); + $table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0'); + $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $dbman->create_table($table); + + $DB->insert_record($tablename, array('course' => 1)); + $DB->insert_record($tablename, array('course' => 2)); + $DB->insert_record($tablename, array('course' => 3)); + $DB->insert_record($tablename, array('course' => 4)); + + $rs = $DB->get_recordset($tablename, array(), 'id'); + + $DB->set_field($tablename, 'course', 666, array('course'=>1)); + $DB->delete_records($tablename, array('course'=>2)); + + $i = 0; + foreach($rs as $record) { + $i++; + $this->assertEquals($i, $record->course); + } + $rs->close(); + $this->assertEquals(4, $i); + + // Now repeat with limits because it may use different code. + $DB->delete_records($tablename, array()); + + $DB->insert_record($tablename, array('course' => 1)); + $DB->insert_record($tablename, array('course' => 2)); + $DB->insert_record($tablename, array('course' => 3)); + $DB->insert_record($tablename, array('course' => 4)); + + $rs = $DB->get_recordset($tablename, array(), 'id', '*', 0, 3); + + $DB->set_field($tablename, 'course', 666, array('course'=>1)); + $DB->delete_records($tablename, array('course'=>2)); + + $i = 0; + foreach($rs as $record) { + $i++; + $this->assertEquals($i, $record->course); + } + $rs->close(); + $this->assertEquals(3, $i); + } + public function test_get_recordset_iterator_keys() { $DB = $this->tdb; $dbman = $DB->get_manager(); -- 1.7.9.5 From 19ba134d3bbb6e36c51da63f6292c6ddf882a519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Sun, 1 Jul 2012 21:50:36 +0200 Subject: [PATCH 033/903] MDL-34130 prevent some warning in PHPStorm --- lib/dml/tests/dml_test.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index 9099445..a5ad8c2 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -308,6 +308,7 @@ class dml_testcase extends database_driver_testcase { function test_fix_sql_params() { $DB = $this->tdb; + $prefix = $DB->get_prefix(); $table = $this->get_test_table(); $tablename = $table->getName(); @@ -315,13 +316,13 @@ class dml_testcase extends database_driver_testcase { // Correct table placeholder substitution $sql = "SELECT * FROM {{$tablename}}"; $sqlarray = $DB->fix_sql_params($sql); - $this->assertEquals("SELECT * FROM {$DB->get_prefix()}".$tablename, $sqlarray[0]); + $this->assertEquals("SELECT * FROM {$prefix}".$tablename, $sqlarray[0]); // Conversions of all param types $sql = array(); - $sql[SQL_PARAMS_NAMED] = "SELECT * FROM {$DB->get_prefix()}testtable WHERE name = :param1, course = :param2"; - $sql[SQL_PARAMS_QM] = "SELECT * FROM {$DB->get_prefix()}testtable WHERE name = ?, course = ?"; - $sql[SQL_PARAMS_DOLLAR] = "SELECT * FROM {$DB->get_prefix()}testtable WHERE name = \$1, course = \$2"; + $sql[SQL_PARAMS_NAMED] = "SELECT * FROM {$prefix}testtable WHERE name = :param1, course = :param2"; + $sql[SQL_PARAMS_QM] = "SELECT * FROM {$prefix}testtable WHERE name = ?, course = ?"; + $sql[SQL_PARAMS_DOLLAR] = "SELECT * FROM {$prefix}testtable WHERE name = \$1, course = \$2"; $params = array(); $params[SQL_PARAMS_NAMED] = array('param1'=>'first record', 'param2'=>1); -- 1.7.9.5 From 1494f20da3af51ab1c6c7051ec5a888461627a0f Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 2 Jul 2012 00:54:05 +0200 Subject: [PATCH 034/903] weekly release 2.3+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 6739bbe..728ef4d 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062500.00; // 2012062500 = branching date YYYYMMDD - do not modify! +$version = 2012062500.01; // 2012062500 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3 (Build: 20120625)'; // Human-friendly version name +$release = '2.3+ (Build: 20120701)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From e5c2bbd0f7f013982ed1a38bd55dccf5b5388f20 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Fri, 8 Jun 2012 09:59:59 +0800 Subject: [PATCH 035/903] MDL-33303 Filepicker: resized to match HTML editor and made resizable --- files/renderer.php | 17 ++++++++++--- lib/form/filemanager.js | 51 ++++++++++++++++++++++++++++++++++++-- theme/base/style/filemanager.css | 6 +++-- 3 files changed, 67 insertions(+), 7 deletions(-) diff --git a/files/renderer.php b/files/renderer.php index 33a70f6..edcb585 100644 --- a/files/renderer.php +++ b/files/renderer.php @@ -107,7 +107,7 @@ class core_files_renderer extends plugin_renderer_base { $module = array( 'name'=>'form_filemanager', 'fullpath'=>'/lib/form/filemanager.js', - 'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'), + 'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin', 'resize'), 'strings' => array( array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'), array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'), @@ -123,6 +123,7 @@ class core_files_renderer extends plugin_renderer_base { array($this->filemanager_js_templates()), true, $module); } $this->page->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module); + user_preference_allow_ajax_update('filemanagerresizedto', PARAM_SEQUENCE); // non javascript file manager $html .= '\n"; + echo "\n\n"; } diff --git a/user/view.php b/user/view.php index 66728b7..68d36ac 100644 --- a/user/view.php +++ b/user/view.php @@ -354,7 +354,7 @@ echo $OUTPUT->footer(); /// Functions /////// function print_row($left, $right) { - echo "\n\n"; + echo "\n\n"; } -- 1.7.9.5 From a1a00aeee7c9291b51266d9bd3de89a7b89a636c Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Fri, 4 May 2012 11:52:09 +0800 Subject: [PATCH 090/903] MDL-30912 - lib - A tidy up of the submit url jump functions for greater ease with accessability. --- lib/javascript-static.js | 27 +++++++++++++++------------ lib/outputrenderers.php | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 6bf2e28..ed9aaba 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -381,26 +381,26 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) { if ((nothing===false || select.get('value') != nothing) && paramobject.lastindex != select.get('selectedIndex')) { //prevent event bubbling and detach handlers to prevent multiple submissions caused by double clicking e.halt(); - paramobject.eventkeypress.detach(); - paramobject.eventblur.detach(); paramobject.eventchangeorblur.detach(); - this.submit(); } }; - // Attach the change event to the keypress, blur, and click actions. + + var changedown = function(e, paramobject) { + if ((nothing===false || select.get('value') != nothing) && paramobject.lastindex != select.get('selectedIndex')) { + if(e.keyCode == 13) { + form.submit(); + } + } + } + + // Attach the change event to the keydown and click actions. // We don't use the change event because IE fires it on every arrow up/down // event.... usability var paramobject = new Object(); paramobject.lastindex = select.get('selectedIndex'); - paramobject.eventkeypress = Y.on('key', processchange, select, 'press:13', form, paramobject); - paramobject.eventblur = select.on('blur', processchange, form, paramobject); - //little hack for chrome that need onChange event instead of onClick - see MDL-23224 - if (Y.UA.webkit) { - paramobject.eventchangeorblur = select.on('change', processchange, form, paramobject); - } else { - paramobject.eventchangeorblur = select.on('click', processchange, form, paramobject); - } + paramobject.eventchangeorblur = select.on('click', processchange, form, paramobject); + paramobject.eventkeypress = Y.on('keydown', changedown, select, '', form, paramobject); } } }); @@ -408,6 +408,9 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) { /** * Attach handler to url_select + * Deprecated from 2.3 onwards. + * Please use @see init_select_autosubmit() for redirecting to a url (above). + * This function has accessability issues and also does not use the formid passed through as a parameter. */ M.util.init_url_select = function(Y, formid, selectid, nothing) { YUI(M.yui.loader).use('node', function(Y) { diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 697ca6f..1d16603 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1472,7 +1472,7 @@ class core_renderer extends renderer_base { $go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go'))); $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline')); $nothing = empty($select->nothing) ? false : key($select->nothing); - $output .= $this->page->requires->js_init_call('M.util.init_url_select', array($select->formid, $select->attributes['id'], $nothing)); + $output .= $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing)); } else { $output .= html_writer::empty_tag('input', array('type'=>'submit', 'value'=>$select->showbutton)); } -- 1.7.9.5 From 60a72a03b25a87e1df8bfe8e8ce0f67cddbafe53 Mon Sep 17 00:00:00 2001 From: sam marshall Date: Thu, 21 Jun 2012 16:24:40 +0100 Subject: [PATCH 091/903] MDL-33937 Paged course view: Allows view of sections that are not visible --- course/view.php | 14 ++++++++++++-- lib/modinfolib.php | 12 ++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/course/view.php b/course/view.php index e4a18cd..ad495dd 100644 --- a/course/view.php +++ b/course/view.php @@ -99,8 +99,18 @@ $infoid = $course->id; if(!empty($section)) { $loglabel = 'view section'; - $sectionparams = array('course' => $course->id, 'section' => $section); - $coursesections = $DB->get_record('course_sections', $sectionparams, 'id', MUST_EXIST); + + // Get section details and check it exists. + $modinfo = get_fast_modinfo($course); + $coursesections = $modinfo->get_section_info($section, MUST_EXIST); + + // Check user is allowed to see it. + if (!$coursesections->uservisible) { + // Note: We actually already know they don't have this capability + // or uservisible would have been true; this is just to get the + // correct error message shown. + require_capability('moodle/course:viewhiddensections', $context); + } $infoid = $coursesections->id; $logparam .= '§ionid='. $infoid; } diff --git a/lib/modinfolib.php b/lib/modinfolib.php index bcbb7ec..f22f697 100644 --- a/lib/modinfolib.php +++ b/lib/modinfolib.php @@ -202,9 +202,17 @@ class course_modinfo extends stdClass { /** * Gets data about specific numbered section. * @param int $sectionnumber Number (not id) of section - * @return section_info Information for numbered section + * @param int $strictness Use MUST_EXIST to throw exception if it doesn't + * @return section_info Information for numbered section or null if not found */ - public function get_section_info($sectionnumber) { + public function get_section_info($sectionnumber, $strictness = IGNORE_MISSING) { + if (!array_key_exists($sectionnumber, $this->sectioninfo)) { + if ($strictness === MUST_EXIST) { + throw new moodle_exception('sectionnotexist'); + } else { + return null; + } + } return $this->sectioninfo[$sectionnumber]; } -- 1.7.9.5 From 3e1648723ffd71c4340d84ed53c420945305671c Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 26 Jun 2012 17:28:03 +0800 Subject: [PATCH 092/903] MDL-33828 Portfolio: prevent notices while exporting to portfolios --- lib/portfolio/exporter.php | 21 ++++++++++++--------- mod/assign/portfolio_callback.php | 4 +++- portfolio/boxnet/lib.php | 5 +++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/portfolio/exporter.php b/lib/portfolio/exporter.php index 3baf0b5..79bfc8f 100644 --- a/lib/portfolio/exporter.php +++ b/lib/portfolio/exporter.php @@ -722,15 +722,18 @@ class portfolio_exporter { if ($this->get('user')->id != $USER->id) { // make sure it belongs to the right user throw new portfolio_exception('notyours', 'portfolio'); } - if (!$readonly && $this->get('instance') && !$this->get('instance')->allows_multiple_exports() - && ($already = portfolio_existing_exports($this->get('user')->id, $this->get('instance')->get('plugin'))) - && array_shift(array_keys($already)) != $this->get('id') - ) { - $a = (object)array( - 'plugin' => $this->get('instance')->get('plugin'), - 'link' => $CFG->wwwroot . '/user/portfoliologs.php', - ); - throw new portfolio_exception('nomultipleexports', 'portfolio', '', $a); + if (!$readonly && $this->get('instance') && !$this->get('instance')->allows_multiple_exports()) { + $already = portfolio_existing_exports($this->get('user')->id, $this->get('instance')->get('plugin')); + $already = array_keys($already); + + if (array_shift($already) != $this->get('id')) { + + $a = (object)array( + 'plugin' => $this->get('instance')->get('plugin'), + 'link' => $CFG->wwwroot . '/user/portfoliologs.php', + ); + throw new portfolio_exception('nomultipleexports', 'portfolio', '', $a); + } } if (!$this->caller->check_permissions()) { // recall the caller permission check throw new portfolio_caller_exception('nopermissions', 'portfolio', $this->caller->get_return_url()); diff --git a/mod/assign/portfolio_callback.php b/mod/assign/portfolio_callback.php index cee75bc..71e6d82 100644 --- a/mod/assign/portfolio_callback.php +++ b/mod/assign/portfolio_callback.php @@ -45,6 +45,9 @@ class assign_portfolio_caller extends portfolio_module_caller_base { /** @var int callback arg - the id of submission we export */ protected $sid; + /** @var string component of the submission files we export*/ + protected $component; + /** @var string callback arg - the area of submission files we export */ protected $area; @@ -60,7 +63,6 @@ class assign_portfolio_caller extends portfolio_module_caller_base { /** @var string callback arg - the name of the editor field we export */ protected $editor; - /** * callback arg for a single file export */ diff --git a/portfolio/boxnet/lib.php b/portfolio/boxnet/lib.php index 120f61e..a793767 100644 --- a/portfolio/boxnet/lib.php +++ b/portfolio/boxnet/lib.php @@ -37,8 +37,9 @@ class portfolio_plugin_boxnet extends portfolio_plugin_push_base { ) ); if (array_key_exists('status', $return) && $return['status'] == 'upload_ok' - && array_key_exists('id', $return) && count($return['id']) == 1) { - $this->rename_file($return['id'][array_pop(array_keys($return['id']))], $file->get_filename()); + && array_key_exists('id', $return) && count($return['id']) == 1) { + $returnid = array_keys($return['id']); + $this->rename_file($return['id'][array_pop($returnid)], $file->get_filename()); // if this fails, the file was sent but not renamed - this triggers a warning but is not fatal. } } -- 1.7.9.5 From 28f23328c54f12740897ac5d02f2063f10bc021c Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 15 May 2012 21:53:09 +0400 Subject: [PATCH 093/903] MDL-32787 user: rule required for custom profile fields applies to all users editing own profile --- user/edit.php | 3 ++- user/edit_form.php | 27 ++++++++++++++++----------- user/editadvanced.php | 3 ++- user/editadvanced_form.php | 24 ++++++++++++++---------- user/profile/lib.php | 8 +++++--- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/user/edit.php b/user/edit.php index ca52ed3..7644861 100644 --- a/user/edit.php +++ b/user/edit.php @@ -165,7 +165,8 @@ $user->imagefile = $draftitemid; //create form $userform = new user_edit_form(null, array( 'editoroptions' => $editoroptions, - 'filemanageroptions' => $filemanageroptions)); + 'filemanageroptions' => $filemanageroptions, + 'userid' => $user->id)); if (empty($user->country)) { // MDL-16308 - we must unset the value here so $CFG->country can be used as default one unset($user->country); diff --git a/user/edit_form.php b/user/edit_form.php index e53672f..b077a0c 100644 --- a/user/edit_form.php +++ b/user/edit_form.php @@ -10,18 +10,23 @@ class user_edit_form extends moodleform { // Define the form function definition () { - global $CFG, $COURSE; + global $CFG, $COURSE, $USER; $mform =& $this->_form; - if (is_array($this->_customdata) && array_key_exists('editoroptions', $this->_customdata)) { - $editoroptions = $this->_customdata['editoroptions']; - } else { - $editoroptions = null; - } - if (is_array($this->_customdata) && array_key_exists('filemanageroptions', $this->_customdata)) { - $filemanageroptions = $this->_customdata['filemanageroptions']; - } else { - $filemanageroptions = null; + $editoroptions = null; + $filemanageroptions = null; + $userid = $USER->id; + + if (is_array($this->_customdata)) { + if (array_key_exists('editoroptions', $this->_customdata)) { + $editoroptions = $this->_customdata['editoroptions']; + } + if (array_key_exists('filemanageroptions', $this->_customdata)) { + $filemanageroptions = $this->_customdata['filemanageroptions']; + } + if (array_key_exists('userid', $this->_customdata)) { + $userid = $this->_customdata['userid']; + } } //Accessibility: "Required" is bad legend text. $strgeneral = get_string('general'); @@ -47,7 +52,7 @@ class user_edit_form extends moodleform { } /// Next the customisable profile fields - profile_definition($mform); + profile_definition($mform, $userid); $this->add_action_buttons(false, get_string('updatemyprofile')); } diff --git a/user/editadvanced.php b/user/editadvanced.php index 5226c0a..cdf03bd 100644 --- a/user/editadvanced.php +++ b/user/editadvanced.php @@ -146,7 +146,8 @@ $user->imagefile = $draftitemid; //create form $userform = new user_editadvanced_form(null, array( 'editoroptions' => $editoroptions, - 'filemanageroptions' => $filemanageroptions)); + 'filemanageroptions' => $filemanageroptions, + 'userid' => $user->id)); $userform->set_data($user); if ($usernew = $userform->get_data()) { diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php index 7092f02..dbe6d82 100644 --- a/user/editadvanced_form.php +++ b/user/editadvanced_form.php @@ -13,16 +13,20 @@ class user_editadvanced_form extends moodleform { global $USER, $CFG, $COURSE; $mform =& $this->_form; + $editoroptions = null; + $filemanageroptions = null; + $userid = $USER->id; - if (is_array($this->_customdata) && array_key_exists('editoroptions', $this->_customdata)) { - $editoroptions = $this->_customdata['editoroptions']; - } else { - $editoroptions = null; - } - if (is_array($this->_customdata) && array_key_exists('filemanageroptions', $this->_customdata)) { - $filemanageroptions = $this->_customdata['filemanageroptions']; - } else { - $filemanageroptions = null; + if (is_array($this->_customdata)) { + if (array_key_exists('editoroptions', $this->_customdata)) { + $editoroptions = $this->_customdata['editoroptions']; + } + if (array_key_exists('filemanageroptions', $this->_customdata)) { + $filemanageroptions = $this->_customdata['filemanageroptions']; + } + if (array_key_exists('userid', $this->_customdata)) { + $userid = $this->_customdata['userid']; + } } //Accessibility: "Required" is bad legend text. @@ -66,7 +70,7 @@ class user_editadvanced_form extends moodleform { useredit_shared_definition($mform, $editoroptions, $filemanageroptions); /// Next the customisable profile fields - profile_definition($mform); + profile_definition($mform, $userid); $this->add_action_buttons(false, get_string('updatemyprofile')); } diff --git a/user/profile/lib.php b/user/profile/lib.php index 54649d7..fd30d58 100644 --- a/user/profile/lib.php +++ b/user/profile/lib.php @@ -169,7 +169,8 @@ class profile_field_base { * @param object instance of the moodleform class */ function edit_field_set_required($mform) { - if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) { + global $USER; + if ($this->is_required() && ($this->userid == $USER->id)) { $mform->addRule($this->inputname, get_string('required'), 'required', null, 'client'); } } @@ -352,8 +353,9 @@ function profile_load_data($user) { /** * Print out the customisable categories and fields for a users profile * @param object instance of the moodleform class + * @param int $userid id of user whose profile is being edited. */ -function profile_definition($mform) { +function profile_definition($mform, $userid = 0) { global $CFG, $DB; // if user is "admin" fields are displayed regardless @@ -377,7 +379,7 @@ function profile_definition($mform) { foreach ($fields as $field) { require_once($CFG->dirroot.'/user/profile/field/'.$field->datatype.'/field.class.php'); $newfield = 'profile_field_'.$field->datatype; - $formfield = new $newfield($field->id); + $formfield = new $newfield($field->id, $userid); $formfield->edit_field($mform); } } -- 1.7.9.5 From a5f68fb2c2149b30d32f81373e3ef17e3733f5f5 Mon Sep 17 00:00:00 2001 From: sam marshall Date: Wed, 13 Jun 2012 16:45:42 +0100 Subject: [PATCH 094/903] MDL-33426 Completion: Multilang activity names wrong in alt/title --- course/lib.php | 10 +++++----- report/progress/index.php | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/course/lib.php b/course/lib.php index 82f2b8c..374b309 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1470,9 +1470,8 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // 2. the activity has dates set which do not include current, or // 3. the activity has any other conditions set (regardless of whether // current user meets them) - $canviewhidden = has_capability( - 'moodle/course:viewhiddenactivities', - get_context_instance(CONTEXT_MODULE, $mod->id)); + $modcontext = context_module::instance($mod->id); + $canviewhidden = has_capability('moodle/course:viewhiddenactivities', $modcontext); $accessiblebutdim = false; if ($canviewhidden) { $accessiblebutdim = !$mod->visible; @@ -1684,9 +1683,10 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, } if ($completionicon) { $imgsrc = $OUTPUT->pix_url('i/completion-'.$completionicon); - $imgalt = s(get_string('completion-alt-'.$completionicon, 'completion', $mod->name)); + $formattedname = format_string($mod->name, true, array('context' => $modcontext)); + $imgalt = get_string('completion-alt-' . $completionicon, 'completion', $formattedname); if ($completion == COMPLETION_TRACKING_MANUAL && !$isediting) { - $imgtitle = s(get_string('completion-title-'.$completionicon, 'completion', $mod->name)); + $imgtitle = get_string('completion-title-' . $completionicon, 'completion', $formattedname); $newstate = $completiondata->completionstate==COMPLETION_COMPLETE ? COMPLETION_INCOMPLETE diff --git a/report/progress/index.php b/report/progress/index.php index 318903d..7192f2f 100644 --- a/report/progress/index.php +++ b/report/progress/index.php @@ -386,12 +386,13 @@ foreach($progress as $user) { ($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual'). '-'.$completiontype; + $modcontext = context_module::instance($activity->id); $describe = get_string('completion-' . $completiontype, 'completion'); $a=new StdClass; $a->state=$describe; $a->date=$date; $a->user=fullname($user); - $a->activity=strip_tags($activity->name); + $a->activity = format_string($activity->name, true, array('context' => $modcontext)); $fulldescribe=get_string('progress-title','completion',$a); if ($csv) { -- 1.7.9.5 From e3f4094ac826f3f3016b22b95ba84daee20dbc91 Mon Sep 17 00:00:00 2001 From: Kevin Wiliarty Date: Tue, 19 Jun 2012 14:14:49 -0400 Subject: [PATCH 095/903] MDL-33749 follow redirects for URL downloader --- repository/url/lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/repository/url/lib.php b/repository/url/lib.php index 20725c8..ba247ff 100644 --- a/repository/url/lib.php +++ b/repository/url/lib.php @@ -127,6 +127,7 @@ EOD; } $this->processedfiles[] = $url; $curl = new curl; + $curl->setopt(array('CURLOPT_FOLLOWLOCATION' => true, 'CURLOPT_MAXREDIRS' => 3)); $msg = $curl->head($url); $info = $curl->get_info(); if ($info['http_code'] != 200) { -- 1.7.9.5 From 3bcca35591b11e0ecc4d4ca4e9e63b7be55cf045 Mon Sep 17 00:00:00 2001 From: Jonathan Harker Date: Wed, 20 Jun 2012 15:45:47 +1200 Subject: [PATCH 096/903] MDL-27125 better manage file handles when downloading multiple files. Based on Dongsheng Cai's branch: s11_MDL-27125_curl_file_handler_master --- lib/filelib.php | 49 ++++++++++++++++++++++++++++++++++++------- repository/alfresco/lib.php | 1 + repository/flickr/lib.php | 1 + 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/lib/filelib.php b/lib/filelib.php index 523c643..f1e44f3 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -3006,14 +3006,36 @@ class curl { * Calls {@link multi()} with specific download headers * * - * $c = new curl; + * $c = new curl(); + * $file1 = fopen('a', 'wb'); + * $file2 = fopen('b', 'wb'); * $c->download(array( - * array('url'=>'http://localhost/', 'file'=>fopen('a', 'wb')), - * array('url'=>'http://localhost/20/', 'file'=>fopen('b', 'wb')) + * array('url'=>'http://localhost/', 'file'=>$file1), + * array('url'=>'http://localhost/20/', 'file'=>$file2) + * )); + * fclose($file1); + * fclose($file2); + * + * + * or + * + * + * $c = new curl(); + * $c->download(array( + * array('url'=>'http://localhost/', 'filepath'=>'/tmp/file1.tmp'), + * array('url'=>'http://localhost/20/', 'filepath'=>'/tmp/file2.tmp') * )); * * - * @param array $requests An array of files to request + * @param array $requests An array of files to request { + * url => url to download the file [required] + * file => file handler, or + * filepath => file path + * } + * If 'file' and 'filepath' parameters are both specified in one request, the + * open file handle in the 'file' parameter will take precedence and 'filepath' + * will be ignored. + * * @param array $options An array of options to set * @return array An array of results */ @@ -3037,11 +3059,15 @@ class curl { $results = array(); $main = curl_multi_init(); for ($i = 0; $i < $count; $i++) { - $url = $requests[$i]; - foreach($url as $n=>$v){ - $options[$n] = $url[$n]; + if (!empty($requests[$i]['filepath']) and empty($requests[$i]['file'])) { + // open file + $requests[$i]['file'] = fopen($requests[$i]['filepath'], 'w'); + $requests[$i]['auto-handle'] = true; + } + foreach($requests[$i] as $n=>$v){ + $options[$n] = $v; } - $handles[$i] = curl_init($url['url']); + $handles[$i] = curl_init($requests[$i]['url']); $this->apply_opt($handles[$i], $options); curl_multi_add_handle($main, $handles[$i]); } @@ -3058,6 +3084,13 @@ class curl { curl_multi_remove_handle($main, $handles[$i]); } curl_multi_close($main); + + for ($i = 0; $i < $count; $i++) { + if (!empty($requests[$i]['filepath']) and !empty($requests[$i]['auto-handle'])) { + // close file handler if file is opened in this function + fclose($requests[$i]['file']); + } + } return $results; } diff --git a/repository/alfresco/lib.php b/repository/alfresco/lib.php index 705e6e9..b5a871f 100644 --- a/repository/alfresco/lib.php +++ b/repository/alfresco/lib.php @@ -206,6 +206,7 @@ class repository_alfresco extends repository { $fp = fopen($path, 'w'); $c = new curl; $c->download(array(array('url'=>$url, 'file'=>$fp))); + fclose($fp); return array('path'=>$path, 'url'=>$url); } diff --git a/repository/flickr/lib.php b/repository/flickr/lib.php index 6886638..7d3dcd6 100644 --- a/repository/flickr/lib.php +++ b/repository/flickr/lib.php @@ -258,6 +258,7 @@ class repository_flickr extends repository { $c->download(array( array('url'=>$url, 'file'=>$fp) )); + fclose($fp); return array('path'=>$path, 'url'=>$url); } -- 1.7.9.5 From 8530aac4a8e249a12eb033ec5285077ac8f5254e Mon Sep 17 00:00:00 2001 From: sam marshall Date: Sun, 27 May 2012 12:49:10 +0800 Subject: [PATCH 097/903] MDL-33466: Group restriction should hide activity even with 'show availability' option This is a modified version of fix by Luke Tucker at NetSpot - thanks. --- lib/modinfolib.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/modinfolib.php b/lib/modinfolib.php index f22f697..db9b7f6 100644 --- a/lib/modinfolib.php +++ b/lib/modinfolib.php @@ -1086,18 +1086,24 @@ class cm_info extends stdClass { $modcontext = get_context_instance(CONTEXT_MODULE, $this->id); $userid = $this->modinfo->get_user_id(); $this->uservisible = true; + // Check visibility/availability conditions. if ((!$this->visible or !$this->available) and !has_capability('moodle/course:viewhiddenactivities', $modcontext, $userid)) { // If the activity is hidden or unavailable, and you don't have viewhiddenactivities, - // set it so that user can't see or access it + // set it so that user can't see or access it. $this->uservisible = false; - } else if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly) + } + // Check group membership. The grouping option makes the activity + // completely invisible as it does not apply to the user at all. + if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly) and !has_capability('moodle/site:accessallgroups', $modcontext, $userid)) { // If the activity has 'group members only' and you don't have accessallgroups... $groups = $this->modinfo->get_groups($this->groupingid); if (empty($groups)) { // ...and you don't belong to a group, then set it so you can't see/access it $this->uservisible = false; + // Ensure activity is completely hidden from user. + $this->showavailability = 0; } } } -- 1.7.9.5 From 9f6f18d2c24a8e191c13ab99425956c9759cfb2c Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 22 Jun 2012 14:42:20 +0800 Subject: [PATCH 098/903] MDL-31692 mod_lti - ensure that various mforms are used properly * typesettings.php and instructor_edit_tool_type.php are tided up properly to ensure proper use for form data * An incorrect PARAM type is corrected for typename --- mod/lti/edit_form.php | 2 +- mod/lti/instructor_edit_tool_type.php | 9 +-- mod/lti/typessettings.php | 131 ++++++++------------------------- 3 files changed, 34 insertions(+), 108 deletions(-) diff --git a/mod/lti/edit_form.php b/mod/lti/edit_form.php index 3cf2ef8..fec78ee 100644 --- a/mod/lti/edit_form.php +++ b/mod/lti/edit_form.php @@ -62,7 +62,7 @@ class mod_lti_edit_types_form extends moodleform{ $mform->addElement('header', 'setup', get_string('tool_settings', 'lti')); $mform->addElement('text', 'lti_typename', get_string('typename', 'lti')); - $mform->setType('lti_typename', PARAM_INT); + $mform->setType('lti_typename', PARAM_TEXT); $mform->addHelpButton('lti_typename', 'typename', 'lti'); $mform->addRule('lti_typename', null, 'required', null, 'client'); diff --git a/mod/lti/instructor_edit_tool_type.php b/mod/lti/instructor_edit_tool_type.php index b0fe496..c65b3f4 100644 --- a/mod/lti/instructor_edit_tool_type.php +++ b/mod/lti/instructor_edit_tool_type.php @@ -47,9 +47,8 @@ if (!empty($typeid)) { } } -$data = data_submitted(); - -if (isset($data->submitbutton) && confirm_sesskey()) { +$form = new mod_lti_edit_types_form(); +if ($data = $form->get_data()) { $type = new stdClass(); if (!empty($typeid)) { @@ -96,7 +95,7 @@ if (isset($data->submitbutton) && confirm_sesskey()) { die; } -} else if (isset($data->cancel)) { +} else if ($form->is_cancelled()) { $script = " '; + $this->assertEquals('Evil alert("You have been hacked!");', $format->clean_question_name($name)); + + $name = 'This is a very long question name. It goes on and on and on. ' . + 'I wonder if it will ever stop. The quetsion name field in the database is only ' . + 'two hundred and fifty five characters wide, so if the import file contains a ' . + 'name longer than that, the code had better truncate it!'; + $this->assertEquals(shorten_text($name, 251), $format->clean_question_name($name)); + + // The worst case scenario is a whole lot of single charaters in separate multilang tags. + $name = 'A' . + 'B' . + 'C' . + 'D' . + 'E' . + 'F' . + 'G' . + 'H' . + 'I' . + 'J'; + $this->assertEquals(shorten_text($name, 1), $format->clean_question_name($name)); + } + + public function test_create_default_question_name() { + $format = new testable_qformat(); + + $text = 'Nice simple name'; + $this->assertEquals($text, $format->create_default_question_name($text, 'Default')); + + $this->assertEquals('Default', $format->create_default_question_name('', 'Default')); + + $text = 'Question in EnglishFrench'; + $this->assertEquals($text, $format->create_default_question_name($text, 'Default')); + + $text = 'Evil '; + $this->assertEquals('Evil alert("You have been hacked!");', + $format->create_default_question_name($text, 'Default')); + + $text = 'This is a very long question text. It goes on and on and on. ' . + 'I wonder if it will ever stop. The question name field in the database is only ' . + 'two hundred and fifty five characters wide, so if the import file contains a ' . + 'name longer than that, the code had better truncate it!'; + $this->assertEquals(shorten_text($text, 80), $format->create_default_question_name($text, 'Default')); + + // The worst case scenario is a whole lot of single charaters in separate multilang tags. + $text = 'A' . + 'B' . + 'C' . + 'D' . + 'E' . + 'F' . + 'G' . + 'H' . + 'I' . + 'J'; + $this->assertEquals(shorten_text($text, 1), $format->create_default_question_name($text, 'Default')); + } } -- 1.7.9.5 From b4271570c60f54f411d389de368079bca47b6de3 Mon Sep 17 00:00:00 2001 From: Kanika Goyal Date: Mon, 2 Apr 2012 09:52:53 +0530 Subject: [PATCH 627/903] MDL-32125 mod_forum: updating subscription mode not reflected --- mod/forum/lib.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 4556123..5b4617e 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -216,6 +216,13 @@ function forum_update_instance($forum, $mform) { $DB->update_record('forum', $forum); + $modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule); + if (($forum->forcesubscribe == FORUM_INITIALSUBSCRIBE) && ($oldforum->forcesubscribe <> $forum->forcesubscribe)) { + $users = forum_get_potential_subscribers($modcontext, 0, 'u.id, u.email', ''); + foreach ($users as $user) { + forum_subscribe($user->id, $forum->id); + } + } forum_grade_item_update($forum); return true; -- 1.7.9.5 From fa501712c740dfcd937cdb29fc170530324fbff1 Mon Sep 17 00:00:00 2001 From: Kanika Goyal Date: Mon, 2 Apr 2012 09:55:12 +0530 Subject: [PATCH 628/903] MDL-32125 mod_forum: updating subscription mode not reflected --- mod/forum/lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 5b4617e..f0147e6 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -223,6 +223,7 @@ function forum_update_instance($forum, $mform) { forum_subscribe($user->id, $forum->id); } } + forum_grade_item_update($forum); return true; -- 1.7.9.5 From b3557ac52db2a47c9d6b2fbfc2743881345bfe0b Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 13 Sep 2012 00:34:33 +0000 Subject: [PATCH 629/903] Automatically generated installer lang files --- install/lang/eu/admin.php | 2 +- install/lang/ga/error.php | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 install/lang/ga/error.php diff --git a/install/lang/eu/admin.php b/install/lang/eu/admin.php index 51e908c..e751fee 100644 --- a/install/lang/eu/admin.php +++ b/install/lang/eu/admin.php @@ -39,5 +39,5 @@ $string['clitypevaluedefault'] = 'sartu balorea, sakatu Enter-i berezko balorea $string['cliunknowoption'] = 'Aukera ezezagunak:{$a} Mesedez, erabili --laguntza aukera.'; $string['cliyesnoprompt'] = 'idatzi b (bai esateko) edo e (ez esateko)'; -$string['environmentrequireinstall'] = 'derrigorrezkoa da instalatuta etagaituta izatea'; +$string['environmentrequireinstall'] = 'derrigorrezkoa da instalatuta eta gaituta izatea'; $string['environmentrequireversion'] = '{$a->needed} bertsioa beharrezkoa da eta zu {$a->current} ari zara egikaritzen'; diff --git a/install/lang/ga/error.php b/install/lang/ga/error.php new file mode 100644 index 0000000..3655f09 --- /dev/null +++ b/install/lang/ga/error.php @@ -0,0 +1,48 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['cannotcreatelangdir'] = 'Ní féidir eolaire teanga a chruthú'; +$string['cannotcreatetempdir'] = 'Ní féidir eolaire sealadach a chruthú'; +$string['cannotdownloadcomponents'] = 'Ní féidir na comhphairteanna a íoslódáil'; +$string['cannotdownloadzipfile'] = 'Ní féidir comhad ZIP a íoslódáil'; +$string['cannotfindcomponent'] = 'Ní féidir teacht ar chomhpháirt'; +$string['cannotsavemd5file'] = 'Ni féidir an comhad md5 a shábháil'; +$string['cannotsavezipfile'] = 'Ni féidir an comhad ZIP a shábháil'; +$string['cannotunzipfile'] = 'Ní féidir an comhad a dhízipeáil'; +$string['componentisuptodate'] = 'Tá an chomhpháirt suas chun dáta'; +$string['downloadedfilecheckfailed'] = 'Theip ar an seiceáil comhaid íoslódailte'; +$string['invalidmd5'] = 'Bhí "an athróg seiceála mícheart – triail arís é'; +$string['missingrequiredfield'] = 'Réimse riachtanach ar iarraidh'; +$string['remotedownloaderror'] = 'Theip ar íoslódail comhpháirte chuig do fhreastalaí, dearbhaigh seachshocruithe moltar iarmhíreanna , PHP cURL go hard.

Y Caithfidh tú an comhad url}"">{$a->url} a íoslódáil de láimh'; +$string['wrongdestpath'] = 'Cosán sprice mícheart'; +$string['wrongsourcebase'] = 'Foinse mícheart do bhunachar URL'; +$string['wrongzipfilename'] = 'Ainm mícherat comhaid ZIP'; -- 1.7.9.5 From a6984540892ef2072200ac7cbd3774c4f11f5041 Mon Sep 17 00:00:00 2001 From: Simon Coggins Date: Wed, 1 Aug 2012 11:08:50 +1200 Subject: [PATCH 630/903] MDL-34644 SCORM fix completion when only completion on view is selected. --- mod/scorm/lib.php | 58 ++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index 822d3e2..c587b68 100644 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -1183,33 +1183,37 @@ function scorm_get_completion_state($course, $cm, $userid, $type) { if (!$scorm = $DB->get_record('scorm', array('id' => $cm->instance))) { print_error('cannotfindscorm'); } - - // Get user's tracks data - $tracks = $DB->get_records_sql( - " - SELECT - id, - element, - value - FROM - {scorm_scoes_track} - WHERE - scormid = ? - AND userid = ? - AND element IN - ( - 'cmi.core.lesson_status', - 'cmi.completion_status', - 'cmi.success_status', - 'cmi.core.score.raw', - 'cmi.score.raw' - ) - ", - array($scorm->id, $userid) - ); - - if (!$tracks) { - return completion_info::aggregate_completion_states($type, $result, false); + // Only check for existence of tracks and return false if completionstatusrequired or completionscorerequired + // this means that if only view is required we don't end up with a false state. + if ($scorm->completionstatusrequired !== null || + $scorm->completionscorerequired !== null) { + // Get user's tracks data. + $tracks = $DB->get_records_sql( + " + SELECT + id, + element, + value + FROM + {scorm_scoes_track} + WHERE + scormid = ? + AND userid = ? + AND element IN + ( + 'cmi.core.lesson_status', + 'cmi.completion_status', + 'cmi.success_status', + 'cmi.core.score.raw', + 'cmi.score.raw' + ) + ", + array($scorm->id, $userid) + ); + + if (!$tracks) { + return completion_info::aggregate_completion_states($type, $result, false); + } } // Check for status -- 1.7.9.5 From c21f901559d566b940e70b36be7cd462275f6699 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 13 Sep 2012 16:33:15 +0100 Subject: [PATCH 631/903] MDL-35419 question manual grading: valdiation must handle 0,5 Yet another , as decimal separator issue! To fix this nicely, I refactored some code into question_utils. --- question/behaviour/behaviourbase.php | 6 +++--- question/engine/lib.php | 27 ++++++++++++++++++++++++++ question/engine/questionattempt.php | 9 ++------- question/engine/tests/questionutils_test.php | 12 +++++++++++- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/question/behaviour/behaviourbase.php b/question/behaviour/behaviourbase.php index cd527ef..1f6beb2 100644 --- a/question/behaviour/behaviourbase.php +++ b/question/behaviour/behaviourbase.php @@ -477,9 +477,9 @@ abstract class question_behaviour { */ public static function is_manual_grade_in_range($qubaid, $slot) { $prefix = 'q' . $qubaid . ':' . $slot . '_'; - $mark = optional_param($prefix . '-mark', null, PARAM_NUMBER); - $maxmark = optional_param($prefix . '-maxmark', null, PARAM_NUMBER); - $minfraction = optional_param($prefix . ':minfraction', null, PARAM_NUMBER); + $mark = question_utils::optional_param_mark($prefix . '-mark'); + $maxmark = optional_param($prefix . '-maxmark', null, PARAM_FLOAT); + $minfraction = optional_param($prefix . ':minfraction', null, PARAM_FLOAT); return is_null($mark) || ($mark >= $minfraction * $maxmark && $mark <= $maxmark); } diff --git a/question/engine/lib.php b/question/engine/lib.php index d9c7d0f..9fdfc03 100644 --- a/question/engine/lib.php +++ b/question/engine/lib.php @@ -789,6 +789,33 @@ abstract class question_utils { return self::$thousands[$number / 1000 % 10] . self::$hundreds[$number / 100 % 10] . self::$tens[$number / 10 % 10] . self::$units[$number % 10]; } + + /** + * Typically, $mark will have come from optional_param($name, null, PARAM_RAW_TRIMMED). + * This method copes with: + * - keeping null or '' input unchanged. + * - nubmers that were typed as either 1.00 or 1,00 form. + * + * @param string|null $mark raw use input of a mark. + * @return float|string|null cleaned mark as a float if possible. Otherwise '' or null. + */ + public static function clean_param_mark($mark) { + if ($mark === '' || is_null($mark)) { + return $mark; + } + + return clean_param(str_replace(',', '.', $mark), PARAM_FLOAT); + } + + /** + * Get a sumitted variable (from the GET or POST data) that is a mark. + * @param string $parname the submitted variable name. + * @return float|string|null cleaned mark as a float if possible. Otherwise '' or null. + */ + public static function optional_param_mark($parname) { + return self::clean_param_mark( + optional_param($parname, null, PARAM_RAW_TRIMMED)); + } } diff --git a/question/engine/questionattempt.php b/question/engine/questionattempt.php index 1be7df2..d89f0f7 100644 --- a/question/engine/questionattempt.php +++ b/question/engine/questionattempt.php @@ -882,13 +882,8 @@ class question_attempt { public function get_submitted_var($name, $type, $postdata = null) { switch ($type) { case self::PARAM_MARK: - // Special case to work around PARAM_NUMBER converting '' to 0. - $mark = $this->get_submitted_var($name, PARAM_RAW_TRIMMED, $postdata); - if ($mark === '' || is_null($mark)) { - return $mark; - } else { - return clean_param(str_replace(',', '.', $mark), PARAM_NUMBER); - } + // Special case to work around PARAM_FLOAT converting '' to 0. + return question_utils::clean_param_mark($this->get_submitted_var($name, PARAM_RAW_TRIMMED, $postdata)); case self::PARAM_FILES: return $this->process_response_files($name, $name, $postdata); diff --git a/question/engine/tests/questionutils_test.php b/question/engine/tests/questionutils_test.php index e51d4db..e5935f4 100644 --- a/question/engine/tests/questionutils_test.php +++ b/question/engine/tests/questionutils_test.php @@ -191,4 +191,14 @@ class question_utils_test extends advanced_testcase { $this->setExpectedException('moodle_exception'); question_utils::int_to_roman(1.5); } -} \ No newline at end of file + + public function test_clean_param_mark() { + $this->assertNull(question_utils::clean_param_mark(null)); + $this->assertSame('', question_utils::clean_param_mark('')); + $this->assertSame(0.0, question_utils::clean_param_mark('0')); + $this->assertSame(1.5, question_utils::clean_param_mark('1.5')); + $this->assertSame(1.5, question_utils::clean_param_mark('1,5')); + $this->assertSame(-1.5, question_utils::clean_param_mark('-1.5')); + $this->assertSame(-1.5, question_utils::clean_param_mark('-1,5')); + } +} -- 1.7.9.5 From 9844498b0aa0aa80a9a89c1248a2672c427f53de Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Fri, 14 Sep 2012 00:34:18 +0000 Subject: [PATCH 632/903] Automatically generated installer lang files --- install/lang/es/install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/lang/es/install.php b/install/lang/es/install.php index e239a5f..3d0cfd0 100644 --- a/install/lang/es/install.php +++ b/install/lang/es/install.php @@ -41,6 +41,7 @@ $string['databasehost'] = 'Servidor de la base de datos'; $string['databasename'] = 'Nombre de la base de datos'; $string['databasetypehead'] = 'Seleccione el controlador de la base de datos'; $string['dataroot'] = 'Directorio de Datos'; +$string['datarootpermission'] = 'Permisos directorios de datos'; $string['dbprefix'] = 'Prefijo de tablas'; $string['dirroot'] = 'Directorio Moodle'; $string['environmenthead'] = 'Comprobando su entorno'; -- 1.7.9.5 From 77393dec21f63d04910036706d200e461f8b9888 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 14 Sep 2012 10:38:12 +0200 Subject: [PATCH 633/903] Revert "MDL-32125 mod_forum: updating subscription mode not reflected" This reverts commit fa501712c740dfcd937cdb29fc170530324fbff1. --- mod/forum/lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index f0147e6..5b4617e 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -223,7 +223,6 @@ function forum_update_instance($forum, $mform) { forum_subscribe($user->id, $forum->id); } } - forum_grade_item_update($forum); return true; -- 1.7.9.5 From b92083421c7ef4f0ee7e0afc51edf978b1122b32 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 14 Sep 2012 10:38:17 +0200 Subject: [PATCH 634/903] Revert "MDL-32125 mod_forum: updating subscription mode not reflected" This reverts commit b4271570c60f54f411d389de368079bca47b6de3. --- mod/forum/lib.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 5b4617e..4556123 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -216,13 +216,6 @@ function forum_update_instance($forum, $mform) { $DB->update_record('forum', $forum); - $modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule); - if (($forum->forcesubscribe == FORUM_INITIALSUBSCRIBE) && ($oldforum->forcesubscribe <> $forum->forcesubscribe)) { - $users = forum_get_potential_subscribers($modcontext, 0, 'u.id, u.email', ''); - foreach ($users as $user) { - forum_subscribe($user->id, $forum->id); - } - } forum_grade_item_update($forum); return true; -- 1.7.9.5 From 6b3177344d8425e9407e97e19765e2a3f1e739ce Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Fri, 14 Sep 2012 10:17:17 +0100 Subject: [PATCH 635/903] MDL-35163 quiz Make quiz report options available to attempts form --- mod/quiz/report/attemptsreport_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/quiz/report/attemptsreport_table.php b/mod/quiz/report/attemptsreport_table.php index f119da0..4b57900 100644 --- a/mod/quiz/report/attemptsreport_table.php +++ b/mod/quiz/report/attemptsreport_table.php @@ -518,7 +518,7 @@ abstract class quiz_attempts_report_table extends table_sql { return; } - $url = new moodle_url($this->reporturl, $this->displayoptions); + $url = $this->options->get_url(); $url->param('sesskey', sesskey()); echo '
'; -- 1.7.9.5 From 32efb09e62b4a68299c6c9eaafe001cce517e5d0 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 14 Sep 2012 19:10:43 +0200 Subject: [PATCH 636/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 38c2756..d032d57 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.00; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.01; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2 (Build: 20120910)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20120914)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From e7f72fb5d64b387038ef7ca51df71b3bdeef2ab5 Mon Sep 17 00:00:00 2001 From: Itamar Tzadok Date: Mon, 3 Sep 2012 22:58:48 -0400 Subject: [PATCH 637/903] MDL-32688 My Moodle - Fixed fatal error in guest access to My Moodle --- my/index.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/my/index.php b/my/index.php index 1324c79..2b0105f 100644 --- a/my/index.php +++ b/my/index.php @@ -81,11 +81,13 @@ $PAGE->set_subpage($currentpage->id); $PAGE->set_title($header); $PAGE->set_heading($header); -if (get_home_page() != HOMEPAGE_MY) { - if (optional_param('setdefaulthome', false, PARAM_BOOL)) { - set_user_preference('user_home_page_preference', HOMEPAGE_MY); - } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) { - $PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/my/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING); +if (!isguestuser()) { // Skip default home page for guests + if (get_home_page() != HOMEPAGE_MY) { + if (optional_param('setdefaulthome', false, PARAM_BOOL)) { + set_user_preference('user_home_page_preference', HOMEPAGE_MY); + } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) { + $PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/my/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING); + } } } -- 1.7.9.5 From 250b340003cc3557100171a1f70047d748e5caa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Fri, 14 Sep 2012 23:54:16 +0200 Subject: [PATCH 638/903] MDL-35129 add missing recordset closing in db transfer --- lib/dtl/database_exporter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/dtl/database_exporter.php b/lib/dtl/database_exporter.php index 7051c82..5d3c121 100644 --- a/lib/dtl/database_exporter.php +++ b/lib/dtl/database_exporter.php @@ -153,6 +153,7 @@ abstract class database_exporter { $this->export_table_data($table, $row); } $this->finish_table_export($table); + $rs->close(); } $this->finish_database_export(); } -- 1.7.9.5 From fe5a985c0e502a9af0c01403f9e459b542bd1501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 15 Sep 2012 10:49:48 +0200 Subject: [PATCH 639/903] MDL-35129 implement new export_table_recordset() This is necessary because MySQL get_recordset_sql() stores the data in memory, unfortunately the alternative resultset iteration blocks concurrent access - that is why we need new method for export. --- lib/dml/moodle_database.php | 14 ++++++++++++++ lib/dml/mysqli_native_moodle_database.php | 21 ++++++++++++++++++++ lib/dml/tests/dml_test.php | 30 +++++++++++++++++++++++++++++ lib/dtl/database_exporter.php | 2 +- 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php index 9531782..7a81253 100644 --- a/lib/dml/moodle_database.php +++ b/lib/dml/moodle_database.php @@ -1102,6 +1102,20 @@ abstract class moodle_database { public abstract function get_recordset_sql($sql, array $params=null, $limitfrom=0, $limitnum=0); /** + * Get all records from a table. + * + * This method works around potential memory problems and may improve performance, + * this method may block access to table until the recordset is closed. + * + * @param string $table Name of database table. + * @return moodle_recordset A moodle_recordset instance {@link function get_recordset}. + * @throws dml_exception A DML specific exception is thrown for any errors. + */ + public function export_table_recordset($table) { + return $this->get_recordset($table, array()); + } + + /** * Get a number of records as an array of objects where all the given conditions met. * * If the query succeeds and returns at least one record, the diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php index 1a238ba..21404d7 100644 --- a/lib/dml/mysqli_native_moodle_database.php +++ b/lib/dml/mysqli_native_moodle_database.php @@ -905,6 +905,27 @@ class mysqli_native_moodle_database extends moodle_database { return $this->create_recordset($result); } + /** + * Get all records from a table. + * + * This method works around potential memory problems and may improve performance, + * this method may block access to table until the recordset is closed. + * + * @param string $table Name of database table. + * @return moodle_recordset A moodle_recordset instance {@link function get_recordset}. + * @throws dml_exception A DML specific exception is thrown for any errors. + */ + public function export_table_recordset($table) { + $sql = $this->fix_table_names("SELECT * FROM {{$table}}"); + + $this->query_start($sql, array(), SQL_QUERY_SELECT); + // MYSQLI_STORE_RESULT may eat all memory for large tables, unfortunately MYSQLI_USE_RESULT blocks other queries. + $result = $this->mysqli->query($sql, MYSQLI_USE_RESULT); + $this->query_end($result); + + return $this->create_recordset($result); + } + protected function create_recordset($result) { return new mysqli_native_moodle_recordset($result); } diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php index 2bb7270..e056b53 100644 --- a/lib/dml/tests/dml_test.php +++ b/lib/dml/tests/dml_test.php @@ -1300,6 +1300,36 @@ class dml_testcase extends database_driver_testcase { // note: fetching nulls, empties, LOBs already tested by test_insert_record() no needed here } + public function test_export_table_recordset() { + $DB = $this->tdb; + $dbman = $DB->get_manager(); + + $table = $this->get_test_table(); + $tablename = $table->getName(); + + $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null); + $table->add_field('course', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0'); + $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); + $dbman->create_table($table); + + $ids = array(); + $ids[] = $DB->insert_record($tablename, array('course' => 3)); + $ids[] = $DB->insert_record($tablename, array('course' => 5)); + $ids[] = $DB->insert_record($tablename, array('course' => 4)); + $ids[] = $DB->insert_record($tablename, array('course' => 3)); + $ids[] = $DB->insert_record($tablename, array('course' => 2)); + $ids[] = $DB->insert_record($tablename, array('course' => 1)); + $ids[] = $DB->insert_record($tablename, array('course' => 0)); + + $rs = $DB->export_table_recordset($tablename); + $rids = array(); + foreach ($rs as $record) { + $rids[] = $record->id; + } + $rs->close(); + $this->assertEquals($ids, $rids, '', 0, 0, true); + } + public function test_get_records() { $DB = $this->tdb; $dbman = $DB->get_manager(); diff --git a/lib/dtl/database_exporter.php b/lib/dtl/database_exporter.php index 5d3c121..4d9b7bb 100644 --- a/lib/dtl/database_exporter.php +++ b/lib/dtl/database_exporter.php @@ -144,7 +144,7 @@ abstract class database_exporter { $tables = $this->schema->getTables(); $this->begin_database_export($CFG->version, $CFG->release, date('c'), $description); foreach ($tables as $table) { - $rs = $this->mdb->get_recordset_sql('SELECT * FROM {'.$table->getName().'}'); + $rs = $this->mdb->export_table_recordset($table->getName()); if (!$rs) { throw new ddl_table_missing_exception($table->getName()); } -- 1.7.9.5 From 1077bf7086290a5477a9b3fb5911cb216396edf3 Mon Sep 17 00:00:00 2001 From: Eric Merrill Date: Thu, 13 Sep 2012 13:26:36 -0400 Subject: [PATCH 640/903] MDL-35411 assign Include plugin (submission/feedback) info, even when there is no user data. assign_plugin_config data was only included in backups/imports if user data was included in the backup. This patch moves it out with the standard structure of the assign backup. --- .../backup/moodle2/backup_assign_stepslib.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mod/assign/backup/moodle2/backup_assign_stepslib.php b/mod/assign/backup/moodle2/backup_assign_stepslib.php index fa97208..7d9f0a8 100644 --- a/mod/assign/backup/moodle2/backup_assign_stepslib.php +++ b/mod/assign/backup/moodle2/backup_assign_stepslib.php @@ -94,8 +94,9 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st $pluginconfigs->add_child($pluginconfig); - // Define sources + // Define sources. $assign->set_source_table('assign', array('id' => backup::VAR_ACTIVITYID)); + $pluginconfig->set_source_table('assign_plugin_config', array('assignment' => backup::VAR_PARENTID)); if ($userinfo) { $submission->set_source_table('assign_submission', @@ -103,15 +104,12 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st $grade->set_source_table('assign_grades', array('assignment' => backup::VAR_PARENTID)); - $pluginconfig->set_source_table('assign_plugin_config', - array('assignment' => backup::VAR_PARENTID)); - // support 2 types of subplugins + // Support 2 types of subplugins. $this->add_subplugin_structure('assignsubmission', $submission, true); $this->add_subplugin_structure('assignfeedback', $grade, true); } - // Define id annotations $submission->annotate_ids('user', 'userid'); $grade->annotate_ids('user', 'userid'); -- 1.7.9.5 From 28ac357f866428420d2a3e5cc1f03574582c9b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 15 Sep 2012 11:13:04 +0200 Subject: [PATCH 641/903] MDL-35454 ignore invalid $custombytes in get_max_upload_sizes() This fixes installation and phpunit init regression. --- lib/moodlelib.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index ce65499..388ded6 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5959,16 +5959,19 @@ function get_max_upload_sizes($sitebytes = 0, $coursebytes = 0, $modulebytes = 0 return array(); } + $filesize = array(); $filesize[intval($maxsize)] = display_size($maxsize); $sizelist = array(10240, 51200, 102400, 512000, 1048576, 2097152, 5242880, 10485760, 20971520, 52428800, 104857600); - // If custombytes is given then add it to the list. - if (!is_null($custombytes)) { - if (is_number($custombytes)) { - $custombytes = array((int)$custombytes); + // If custombytes is given and is valid then add it to the list. + if (is_number($custombytes) and $custombytes > 0) { + $custombytes = (int)$custombytes; + if (!in_array($custombytes, $sizelist)) { + $sizelist[] = $custombytes; } + } else if (is_array($custombytes)) { $sizelist = array_unique(array_merge($sizelist, $custombytes)); } -- 1.7.9.5 From e4c9460c0b6d439856504fad629763ede029f0af Mon Sep 17 00:00:00 2001 From: David Monllao Date: Tue, 4 Sep 2012 15:59:07 +0800 Subject: [PATCH 642/903] MDL-30847 core Adding ARIA attribute to help windows --- lib/javascript-static.js | 1 + lib/outputrenderers.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 6e7042d..e99e399 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1445,6 +1445,7 @@ M.util.help_icon = { }, display_callback : function(content) { + content = '
' + content + '
'; this.overlay.set('bodyContent', content); }, diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 717ad00..dd03dc8 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1727,7 +1727,7 @@ class core_renderer extends renderer_base { // note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip $title = get_string('helpprefix2', '', trim($helpicon->title, ". \t")); - $attributes = array('href'=>$url, 'title'=>$title); + $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true'); $id = html_writer::random_id('helpicon'); $attributes['id'] = $id; $output = html_writer::tag('a', $output, $attributes); @@ -1792,7 +1792,7 @@ class core_renderer extends renderer_base { // note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip $title = get_string('helpprefix2', '', trim($title, ". \t")); - $attributes = array('href'=>$url, 'title'=>$title); + $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true'); $id = html_writer::random_id('helpicon'); $attributes['id'] = $id; $output = html_writer::tag('a', $output, $attributes); -- 1.7.9.5 From befd59097bab8dda6d7d6d648ee1e89d0f7baa42 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 13 Sep 2012 10:23:43 +0800 Subject: [PATCH 643/903] MDL-33982 TinyMCE: Media preview supports external URLs --- .../3.5.1.1/plugins/moodlemedia/js/media.js | 115 +++++++++++--------- .../3.5.1.1/plugins/moodlemedia/preview.php | 22 ++-- 2 files changed, 71 insertions(+), 66 deletions(-) diff --git a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js index c8520da..07e0d8b 100644 --- a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js +++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/js/media.js @@ -23,43 +23,9 @@ function insertMedia() { tinyMCEPopup.close(); } -function getType(v) { - var fo, i, c, el, x, f = document.forms[0]; - - fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';'); - - // YouTube - if (v.match(/watch\?v=(.+)(.*)/)) { - f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1]; - return 'flash'; - } else if (v.match(/v\/(.+)(.*)/)) { - return 'flash'; - } - - // Google video - if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) { - f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en'; - return 'flash'; - } - - for (i=0; i 0 ? s.substring(0, s.length - 1) : s; @@ -87,10 +53,9 @@ function jsEncode(s) { } function generatePreview(c) { - var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh; + var f = document.forms[0], p = document.getElementById('prev'); p.innerHTML = ''; - var type = getType(f.src.value); var re = new RegExp("(.+)\#(.+)", "i"); var result = f.src.value.match(re); if (result) { @@ -102,7 +67,7 @@ function generatePreview(c) { } // After constrain - pl = serializeParameters(); + var pl = serializeParameters(); if (pl == '') { p.innerHTML = ''; return; @@ -116,22 +81,66 @@ function generatePreview(c) { } pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src); - pl.width = !pl.width ? 100 : pl.width; - pl.height = !pl.height ? 100 : pl.height; - pl.id = !pl.id ? 'moodlemediaid' : pl.id; - pl.name = !pl.name ? 'moodlemedianame' : pl.name; - pl.align = !pl.align ? '' : pl.align; - - // Avoid annoying warning about insecure items - if (!tinymce.isIE || document.location.protocol != 'https:') { - // Include all the draftfile params after the ? - var draftparams = pl.src.toString().replace(/^.*\/draftfile.php\//, ''); - h = ''; - } + // NOTE: Do not try to prevent https security popups here - users would get them later on real page anyway! + + // We can not include URL directly in parameters because some security filters might block it. + p.innerHTML = ''; +} - // I don't know why the HTML comment is there, but leaving it just in case - p.innerHTML = "" + h; +function encode64(input) { + /* + CryptoMX Tools + Copyright (C) 2004 - 2006 Derek Buitenhuis + + This program 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 2 + of the License, or (at your option) any later version. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + var output = ""; + var chr1, chr2, chr3 = ""; + var enc1, enc2, enc3, enc4 = ""; + var i = 0; + + do { + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + + output = output + + keyStr.charAt(enc1) + + keyStr.charAt(enc2) + + keyStr.charAt(enc3) + + keyStr.charAt(enc4); + chr1 = chr2 = chr3 = ""; + enc1 = enc2 = enc3 = enc4 = ""; + } while (i < input.length); + + return output; } tinyMCEPopup.onInit.add(init); diff --git a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php index f26251a..a49e3c0 100644 --- a/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php +++ b/lib/editor/tinymce/tiny_mce/3.5.1.1/plugins/moodlemedia/preview.php @@ -28,18 +28,22 @@ require_once($CFG->libdir . '/filelib.php'); require_once($CFG->libdir . '/editorlib.php'); require_once($CFG->libdir . '/editor/tinymce/lib.php'); -// Must be logged in +// Must be logged in and have a valid session key. require_login(); +require_sesskey(); -// Require path to draftfile.php file -$path = required_param('path', PARAM_PATH); +// URL to the media. +$path = required_param('path', PARAM_RAW); +$path = base64_decode($path); +$url = clean_param($path, PARAM_URL); +$url = new moodle_url($url); $editor = new tinymce_texteditor(); -// Now output this file which is super-simple +// Now output this file which is super-simple. $PAGE->set_pagelayout('embedded'); $PAGE->set_url(new moodle_url('/lib/editor/tinymce/tiny_mce/'.$editor->version.'/plugins/moodlemedia/preview.php', - array('path' => $path))); + array('path' => base64_encode($path)))); $PAGE->set_context(context_system::instance()); $PAGE->add_body_class('core_media_preview'); @@ -47,14 +51,6 @@ echo $OUTPUT->header(); $mediarenderer = $PAGE->get_renderer('core', 'media'); -$path = '/'.trim($path, '/'); - -if (empty($CFG->slasharguments)) { - $url = new moodle_url('/draftfile.php', array('file'=>$path)); -} else { - $url = new moodle_url('/draftfile.php'); - $url->set_slashargument($path); -} if ($mediarenderer->can_embed_url($url)) { echo $mediarenderer->embed_url($url); } -- 1.7.9.5 From 8e977618f8345d357c8f0677b06efb363bc2525c Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 4 Sep 2012 16:02:54 +0800 Subject: [PATCH 644/903] MDL-34975 Accessibility: Collapsible areas captions can be clicked to expand/collapse --- lib/javascript-static.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 6e7042d..42a2ecb 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -88,17 +88,17 @@ M.util.CollapsibleRegion = function(Y, id, userpref, strtooltip) { // Get the caption for the collapsible region var caption = this.div.one('#'+id + '_caption'); - caption.setAttribute('title', strtooltip); // Create a link var a = Y.Node.create(''); - // Create a local scoped lamba function to move nodes to a new link - var movenode = function(node){ - node.remove(); - a.append(node); - }; - // Apply the lamba function on each of the captions child nodes - caption.get('children').each(movenode, this); + a.setAttribute('title', strtooltip); + + // Get all the nodes from caption, remove them and append them to + while (caption.hasChildNodes()) { + child = caption.get('firstChild'); + child.remove(); + a.append(child); + } caption.append(a); // Get the height of the div at this point before we shrink it if required -- 1.7.9.5 From fd7255ace0d0b07c33ef169170a51fe8c639d559 Mon Sep 17 00:00:00 2001 From: Rex Lorenzo Date: Mon, 21 May 2012 16:23:59 -0700 Subject: [PATCH 645/903] MDL-33166 Forum: Adding capability mod/forum:allowforcesubscribe Conflicts: mod/forum/version.php --- mod/forum/db/access.php | 10 ++++++++++ mod/forum/db/events.php | 4 ++-- mod/forum/lang/en/forum.php | 1 + mod/forum/lib.php | 39 +++++++++++++++++++++++++++++++++++++-- mod/forum/version.php | 2 +- 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php index a92df57..e14c65b 100644 --- a/mod/forum/db/access.php +++ b/mod/forum/db/access.php @@ -334,5 +334,15 @@ $capabilities = array( 'manager' => CAP_ALLOW ) ), + 'mod/forum:allowforcesubscribe' => array( + + 'captype' => 'read', + 'contextlevel' => CONTEXT_MODULE, + 'archetypes' => array( + 'student' => CAP_ALLOW, + 'teacher' => CAP_ALLOW, + 'editingteacher' => CAP_ALLOW + ) + ), ); diff --git a/mod/forum/db/events.php b/mod/forum/db/events.php index f11bd37..ded6583 100644 --- a/mod/forum/db/events.php +++ b/mod/forum/db/events.php @@ -25,9 +25,9 @@ /* List of handlers */ $handlers = array ( - 'user_enrolled' => array ( + 'role_assigned' => array ( 'handlerfile' => '/mod/forum/lib.php', - 'handlerfunction' => 'forum_user_enrolled', + 'handlerfunction' => 'forum_user_role_assigned', 'schedule' => 'instant', 'internal' => 1, ), diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index df64fc9..de2c49e 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -155,6 +155,7 @@ $string['forum'] = 'Forum'; $string['forum:addinstance'] = 'Add a new forum'; $string['forum:addnews'] = 'Add news'; $string['forum:addquestion'] = 'Add question'; +$string['forum:allowforcesubscribe'] = 'Allow force subscribe'; $string['forumauthorhidden'] = 'Author (hidden)'; $string['forumblockingalmosttoomanyposts'] = 'You are approaching the posting threshold. You have posted {$a->numposts} times in the last {$a->blockperiod} and the limit is {$a->blockafter} posts.'; $string['forumbodyhidden'] = 'This post cannot be viewed by you, probably because you have not posted in the discussion or the maximum editing time hasn\'t passed yet.'; diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 4556123..5678d9f 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -2860,7 +2860,7 @@ function forum_get_potential_subscribers($forumcontext, $groupid, $fields, $sort global $DB; // only active enrolled users or everybody on the frontpage - list($esql, $params) = get_enrolled_sql($forumcontext, '', $groupid, true); + list($esql, $params) = get_enrolled_sql($forumcontext, 'mod/forum:allowforcesubscribe', $groupid, true); $sql = "SELECT $fields FROM {user} u @@ -4623,7 +4623,9 @@ function forum_is_subscribed($userid, $forum) { if (is_numeric($forum)) { $forum = $DB->get_record('forum', array('id' => $forum)); } - if (forum_is_forcesubscribed($forum)) { + // If forum is force subscribed and has allowforcesubscribe, then user is subscribed. + if (forum_is_forcesubscribed($forum) && + has_capability('mod/forum:allowforcesubscribe', context_module::instance($forum->id), $userid)) { return true; } return $DB->record_exists("forum_subscriptions", array("userid" => $userid, "forum" => $forum->id)); @@ -6076,6 +6078,7 @@ function forum_update_subscriptions_button($courseid, $forumid) { /** * This function gets run whenever user is enrolled into course * + * @deprecated deprecating this function as we will be using forum_user_role_assigned * @param stdClass $cp * @return void */ @@ -6099,6 +6102,38 @@ function forum_user_enrolled($cp) { } /** + * This function gets run whenever user is assigned role in course + * + * @param stdClass $cp + * @return void + */ +function forum_user_role_assigned($cp) { + global $DB; + + $context = context::instance_by_id($cp->contextid, MUST_EXIST); + + // If contextlevel is course then only subscribe user. Role assignment + // at course level means user is enroled in course and can subscribe to forum. + if ($context->contextlevel != CONTEXT_COURSE) { + return; + } + + $sql = "SELECT f.id + FROM {forum} f + LEFT JOIN {forum_subscriptions} fs ON (fs.forum = f.id AND fs.userid = :userid) + WHERE f.course = :courseid AND f.forcesubscribe = :initial AND fs.id IS NULL"; + $params = array('courseid'=>$context->instanceid, 'userid'=>$cp->userid, 'initial'=>FORUM_INITIALSUBSCRIBE); + + $forums = $DB->get_records_sql($sql, $params); + foreach ($forums as $forum) { + // If user doesn't have allowforcesubscribe capability then don't subscribe. + if (has_capability('mod/forum:allowforcesubscribe', context_module::instance($forum->id), $cp->userid)) { + forum_subscribe($cp->userid, $forum->id); + } + } +} + +/** * This function gets run whenever user is unenrolled from course * * @param stdClass $cp diff --git a/mod/forum/version.php b/mod/forum/version.php index 0413ee7..8a1af57 100644 --- a/mod/forum/version.php +++ b/mod/forum/version.php @@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die(); -$module->version = 2012061700; // The current module version (Date: YYYYMMDDXX) +$module->version = 2012061701; // The current module version (Date: YYYYMMDDXX) $module->requires = 2012061700; // Requires this Moodle version $module->component = 'mod_forum'; // Full name of the plugin (used for diagnostics) $module->cron = 60; -- 1.7.9.5 From 29a33233fcb2446a0a26032bff972428e8ce409c Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Mon, 10 Sep 2012 15:42:38 +0800 Subject: [PATCH 646/903] MDL-30831 Accessibility: Added aria role and attributes to dock block --- blocks/dock.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/blocks/dock.js b/blocks/dock.js index 5e4a56f..4eff68c 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -164,7 +164,7 @@ M.core_dock.init = function(Y) { var dock = Y.one('#dock'); if (!dock) { // Start the construction of the dock - dock = Y.Node.create('
') + dock = Y.Node.create('') .append(Y.Node.create('
') .append(Y.Node.create('
'))); this.nodes.body.append(dock); @@ -1036,7 +1036,7 @@ M.core_dock.item.prototype = { var Y = this.Y; var css = M.core_dock.css; - this.nodes.docktitle = Y.Node.create('
'); + this.nodes.docktitle = Y.Node.create(''); this.nodes.docktitle.append(this.title); this.nodes.dockitem = Y.Node.create('
'); this.nodes.dockitem.on('dock:actionkey', this.toggle, this); @@ -1065,6 +1065,8 @@ M.core_dock.item.prototype = { this.active = true; // Add active item class first up this.nodes.docktitle.addClass(css.activeitem); + // Set aria-exapanded property to true. + this.nodes.docktitle.set('aria-expanded', "true"); this.fire('dockeditem:showcomplete'); M.core_dock.resize(); return true; @@ -1081,6 +1083,8 @@ M.core_dock.item.prototype = { this.nodes.docktitle.removeClass(css.activeitem); // Hide the panel M.core_dock.getPanel().hide(); + // Set aria-exapanded property to false + this.nodes.docktitle.set('aria-expanded', "false"); this.fire('dockeditem:hidecomplete'); }, /** -- 1.7.9.5 From b7f0b0b12b603576ebefb5cd5ad41896e982f3ba Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Mon, 20 Aug 2012 12:00:13 +0800 Subject: [PATCH 647/903] MDL-34778 accessibility compliance for enrol: add label tag for input text --- enrol/authorize/locallib.php | 4 ++-- enrol/ldap/lang/en/enrol_ldap.php | 2 ++ enrol/ldap/settingslib.php | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 9708408..47bd3fa 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -415,8 +415,8 @@ function authorize_print_order($orderid) } $a = new stdClass; $a->upto = $upto; - $extrahtml = get_string('howmuch', 'enrol_authorize') . - ' ' . + $extrahtml = '' . + ' ' . get_string('canbecredit', 'enrol_authorize', $a) . '
'; $table->data[] = array("$strs->confirm:", authorize_print_action_button($orderid, ORDER_REFUND, 0, true, $authstrs->unenrolstudent, $strs->no, $extrahtml)); diff --git a/enrol/ldap/lang/en/enrol_ldap.php b/enrol/ldap/lang/en/enrol_ldap.php index df3b34f..a54e35e 100644 --- a/enrol/ldap/lang/en/enrol_ldap.php +++ b/enrol/ldap/lang/en/enrol_ldap.php @@ -93,6 +93,8 @@ $string['pluginname'] = 'LDAP enrolments'; $string['pluginname_desc'] = '

You can use an LDAP server to control your enrolments. It is assumed your LDAP tree contains groups that map to the courses, and that each of those groups/courses will have membership entries to map to students.

It is assumed that courses are defined as groups in LDAP, with each group having multiple membership fields (member or memberUid) that contain a uniqueidentification of the user.

To use LDAP enrolment, your users must to have a valid idnumber field. The LDAP groups must have that idnumber in the member fields for a user to be enrolled in the course. This will usually work well if you are already using LDAP Authentication.

Enrolments will be updated when the user logs in. You can also run a script to keep enrolments in synch. Look in enrol/ldap/cli/sync.php.

This plugin can also be set to automatically create new courses when new groups appear in LDAP.

'; $string['pluginnotenabled'] = 'Plugin not enabled!'; $string['role_mapping'] = '

For each role that you want to assign from LDAP, you need to specify the list of contexts where the role courses\'s groups are located. Separate different contexts with \';\'.

You also need to specify the attribute your LDAP server uses to hold the members of a group. Usually \'member\' or \'memberUid\'

'; +$string['role_mapping_attribute'] = 'LDAP member attribute for {$a}'; +$string['role_mapping_context'] = 'LDAP contexts for {$a}'; $string['role_mapping_key'] = 'Map roles from LDAP '; $string['roles'] = 'Role mapping'; $string['server_settings'] = 'LDAP server settings'; diff --git a/enrol/ldap/settingslib.php b/enrol/ldap/settingslib.php index 61397a6..d5a882a 100644 --- a/enrol/ldap/settingslib.php +++ b/enrol/ldap/settingslib.php @@ -151,7 +151,8 @@ class admin_setting_ldap_rolemapping extends admin_setting { foreach ($data as $role) { $contextid = $this->get_id().'['.$role['id'].'][contexts]'; $contextname = $this->get_full_name().'['.$role['id'].'][contexts]'; - $return .= '
'; + $return .= '
'; + $return .= '
'; } $return .= '
'; @@ -160,7 +161,8 @@ class admin_setting_ldap_rolemapping extends admin_setting { foreach ($data as $role) { $memberattrid = $this->get_id().'['.$role['id'].'][memberattribute]'; $memberattrname = $this->get_full_name().'['.$role['id'].'][memberattribute]'; - $return .= '
'; + $return .= '
'; + $return .= '
'; } $return .= ''; $return .= '
'; -- 1.7.9.5 From 7a054265dc9d6c7ffb468ae2e1030a17818f5588 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Fri, 14 Sep 2012 17:06:07 +0800 Subject: [PATCH 648/903] MDL-34778 enrol: add a space --- enrol/authorize/locallib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 47bd3fa..04f6530 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -415,7 +415,7 @@ function authorize_print_order($orderid) } $a = new stdClass; $a->upto = $upto; - $extrahtml = '' . + $extrahtml = ' ' . ' ' . get_string('canbecredit', 'enrol_authorize', $a) . '
'; $table->data[] = array("$strs->confirm:", -- 1.7.9.5 From 83fbe988f0d006c1c19b7ddda29b967b0459f18c Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Fri, 17 Aug 2012 15:35:03 +0800 Subject: [PATCH 649/903] MDL-34571 accessibility compliance for report: Add label to select and input text form --- report/courseoverview/index.php | 9 ++++++--- report/log/lang/en/report_log.php | 1 + report/log/locallib.php | 18 ++++++++++++++++++ report/participation/index.php | 2 +- report/stats/locallib.php | 19 ++++++++++--------- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/report/courseoverview/index.php b/report/courseoverview/index.php index 9fe5c13..637f80a 100644 --- a/report/courseoverview/index.php +++ b/report/courseoverview/index.php @@ -75,12 +75,15 @@ $table = new html_table(); $table->width = '*'; $table->align = array('left','left','left','left','left','left'); -$reporttypemenu = html_writer::select($reportoptions,'report',$report, false); -$timeoptionsmenu = html_writer::select($timeoptions,'time',$time, false); +$reporttypemenu = html_writer::label(get_string('statsreporttype'), 'menureport', false, array('class' => 'accesshide')); +$reporttypemenu .= html_writer::select($reportoptions,'report',$report, false); +$timeoptionsmenu = html_writer::label(get_string('time'), 'menutime', false, array('class' => 'accesshide')); +$timeoptionsmenu .= html_writer::select($timeoptions,'time',$time, false); $table->data[] = array(get_string('statsreporttype'),$reporttypemenu, get_string('statstimeperiod'),$timeoptionsmenu, - '', + '' . + '', '') ; echo html_writer::table($table); diff --git a/report/log/lang/en/report_log.php b/report/log/lang/en/report_log.php index 677fab5..e62ad6a 100644 --- a/report/log/lang/en/report_log.php +++ b/report/log/lang/en/report_log.php @@ -26,6 +26,7 @@ $string['log:view'] = 'View course logs'; $string['log:viewtoday'] = 'View today\'s logs'; +$string['logsformat'] = 'Logs format'; $string['page-report-log-x'] = 'Any log report'; $string['page-report-log-index'] = 'Course log report'; $string['page-report-log-user'] = 'User course log report'; diff --git a/report/log/locallib.php b/report/log/locallib.php index dd543b0..9544e91 100644 --- a/report/log/locallib.php +++ b/report/log/locallib.php @@ -306,10 +306,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, echo "\n"; if (has_capability('report/log:view', $sitecontext) && $showcourses) { $cid = empty($course->id)? '1' : $course->id; + echo html_writer::label(get_string('selectacoursesite'), 'menuhost_course', false, array('class' => 'accesshide')); echo html_writer::select($dropdown, "host_course", $hostid.'/'.$cid); } else { $courses = array(); $courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : ''); + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses,"id",$course->id, false); if (has_capability('report/log:view', $sitecontext)) { $a = new stdClass(); @@ -328,10 +330,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, else { $groups = array(); } + echo html_writer::label(get_string('selectagroup'), 'menugroup', false, array('class' => 'accesshide')); echo html_writer::select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { + echo html_writer::label(get_string('participantslist'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, get_string("allparticipants")); } else { @@ -343,20 +347,25 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, else { $users[0] = get_string('allparticipants'); } + echo html_writer::label(get_string('participantslist'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, false); $a->url = "$CFG->wwwroot/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses"; print_string('logtoomanyusers','moodle',$a); } + echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide')); echo html_writer::select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::label(get_string('showreports'), 'menumodid', false, array('class' => 'accesshide')); echo html_writer::select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide')); echo html_writer::select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), 'downloadascsv' => get_string('downloadtext'), 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); + echo html_writer::label(get_string('logsformat', 'report_log'), 'menulogformat', false, array('class' => 'accesshide')); echo html_writer::select($logformats, 'logformat', $logformat, false); echo ''; echo ''; @@ -546,11 +555,13 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= echo "\n"; echo "\n"; if (has_capability('report/log:view', $sitecontext) && $showcourses) { + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses, "id", $course->id, false); } else { // echo ''; $courses = array(); $courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : ''); + echo html_writer::label(get_string('selectacourse'), 'menuid', false, array('class' => 'accesshide')); echo html_writer::select($courses,"id",$course->id, false); if (has_capability('report/log:view', $sitecontext)) { $a = new stdClass(); @@ -569,10 +580,12 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= else { $groups = array(); } + echo html_writer::label(get_string('selectagroup'), 'menugroup', false, array('class' => 'accesshide')); echo html_writer::select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { + echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, get_string("allparticipants")); } else { @@ -584,15 +597,19 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= else { $users[0] = get_string('allparticipants'); } + echo html_writer::label(get_string('selctauser'), 'menuuser', false, array('class' => 'accesshide')); echo html_writer::select($users, "user", $selecteduser, false); $a = new stdClass(); $a->url = "$CFG->wwwroot/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser" ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses"; print_string('logtoomanyusers','moodle',$a); } + echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide')); echo html_writer::select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::label(get_string('activities'), 'menumodid', false, array('class' => 'accesshide')); echo html_writer::select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide')); echo html_writer::select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), @@ -600,6 +617,7 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate= 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); + echo html_writer::label(get_string('logsformat', 'report_log'), 'menulogformat', false, array('class' => 'accesshide')); echo html_writer::select($logformats, 'logformat', $logformat, false); echo ''; echo ''; diff --git a/report/participation/index.php b/report/participation/index.php index 50c5b6e..6fad8e4 100644 --- a/report/participation/index.php +++ b/report/participation/index.php @@ -311,7 +311,7 @@ if (!empty($instanceid) && !empty($roleid)) { } echo ''; echo '
'; - echo ''; + echo ''; $displaylist['messageselect.php'] = get_string('messageselectadd'); echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionselect')); echo $OUTPUT->help_icon('withselectedusers'); diff --git a/report/stats/locallib.php b/report/stats/locallib.php index 1b7fbec..63aa48e 100644 --- a/report/stats/locallib.php +++ b/report/stats/locallib.php @@ -46,6 +46,7 @@ function report_stats_mode_menu($course, $mode, $time, $url) { } $popupurl = $url."?course=$course->id&time=$time"; $select = new single_select(new moodle_url($popupurl), 'mode', $options, $mode, null); + $select->set_label(get_string('reports'), array('class' => 'accesshide')); $select->formid = 'switchmode'; return $OUTPUT->render($select); } @@ -126,21 +127,21 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) { } $table->align = array('left','left','left','left','left','left','left','left'); - $table->data[] = array(get_string('course'),html_writer::select($courseoptions,'course',$course->id,false), - get_string('users'),html_writer::select($users,'userid',$userid,false), - get_string('statsreporttype'),html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), - get_string('statstimeperiod'),html_writer::select($timeoptions,'time',$time,false), + $table->data[] = array(html_writer::label(get_string('course'), 'menucourse'), html_writer::select($courseoptions, 'course', $course->id, false), + html_writer::label(get_string('users'), 'menuuserid'), html_writer::select($users, 'userid', $userid, false), + html_writer::label(get_string('statsreporttype'), 'menureport'), html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + html_writer::label(get_string('statstimeperiod'), 'menutime') ,html_writer::select($timeoptions,'time',$time,false), '') ; } else if ($mode == STATS_MODE_RANKED) { $table->align = array('left','left','left','left','left','left'); - $table->data[] = array(get_string('statsreporttype'),html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), - get_string('statstimeperiod'),html_writer::select($timeoptions,'time',$time,false), + $table->data[] = array(html_writer::label(get_string('statsreporttype'), 'menureport'), html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + html_writer::label(get_string('statstimeperiod'), 'menutime'), html_writer::select($timeoptions,'time',$time,false), '') ; } else if ($mode == STATS_MODE_GENERAL) { $table->align = array('left','left','left','left','left','left','left'); - $table->data[] = array(get_string('course'),html_writer::select($courseoptions,'course',$course->id,false), - get_string('statsreporttype'),html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), - get_string('statstimeperiod'),html_writer::select($timeoptions,'time',$time,false), + $table->data[] = array(html_writer::label(get_string('course'), 'menucourse'), html_writer::select($courseoptions,'course',$course->id,false), + html_writer::label(get_string('statsreporttype'), 'menureport'), html_writer::select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + html_writer::label(get_string('statstimeperiod'), 'menutime'), html_writer::select($timeoptions,'time',$time,false), '') ; } -- 1.7.9.5 From 1530136c2086c3d90cce63f8ca43e3ddeb871fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 10 Sep 2012 17:29:42 +0200 Subject: [PATCH 650/903] MDL-35344 Ignore available updates info with invalid format Previously when the server response validation had failed, the property available_update_checker::recentresponse was left as NULL. This caused problems in available_update_checker::compare_responses() that expects proper arrays passed. This patch makes invalid data being ignored by setting the property to an empty array as if no data have been fetched yet. A debugging message is thrown so the admins will be able to diagnose eventual problems in the future. --- lib/pluginlib.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/pluginlib.php b/lib/pluginlib.php index 65e1c35..76e50eb 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -843,6 +843,11 @@ class available_update_checker { /** * Loads the most recent raw response record we have fetched * + * After this method is called, $this->recentresponse is set to an array. If the + * array is empty, then either no data have been fetched yet or the fetched data + * do not have expected format (and thence they are ignored and a debugging + * message is displayed). + * * This implementation uses the config_plugins table as the permanent storage. * * @param bool $forcereload reload even if it was already loaded @@ -862,7 +867,8 @@ class available_update_checker { $this->recentfetch = $config->recentfetch; $this->recentresponse = $this->decode_response($config->recentresponse); } catch (available_update_checker_exception $e) { - // do not set recentresponse if the validation fails + debugging('Invalid info about available updates detected and will be ignored: '.$e->getMessage(), DEBUG_ALL); + $this->recentresponse = array(); } } else { -- 1.7.9.5 From 58ee763bfb6c2425f57a32d94736357dd53e6101 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Mon, 10 Sep 2012 15:44:21 +0800 Subject: [PATCH 651/903] MDL-33198 book: Adding h tags to book titles to increase accessibility while printing a book --- mod/book/tool/print/index.php | 13 +++++++++---- mod/book/tool/print/locallib.php | 6 +----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mod/book/tool/print/index.php b/mod/book/tool/print/index.php index 9077b84..f33f9a1 100644 --- a/mod/book/tool/print/index.php +++ b/mod/book/tool/print/index.php @@ -91,6 +91,7 @@ if ($chapter) { +

name, true, array('context'=>$context)) ?>

customtitles) { if (!$chapter->subchapter) { $currtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context); - echo '

'.$currtitle.'

'; + echo '

'.$currtitle.'

'; } else { $currtitle = book_get_chapter_title($chapters[$chapter->id]->parent, $chapters, $book, $context); $currsubtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context); - echo '

'.$currtitle.'
'.$currsubtitle.'

'; + echo '

'.$currtitle.'

'.$currsubtitle.'

'; } } @@ -128,7 +129,7 @@ if ($chapter) { -

name, true, array('context'=>$context)) ?>

+

name, true, array('context'=>$context)) ?>

intro, $book->introformat, array('noclean'=>true, 'context'=>$context)) ?>

$left$right
$left$right
$left$right
$left$right
@@ -162,7 +163,11 @@ if ($chapter) { } echo '
'; if (!$book->customtitles) { - echo '

'.$titles[$ch->id].'

'; + if (!$chapter->subchapter) { + echo '

'.$titles[$ch->id].'

'; + } else { + echo '

'.$titles[$ch->id].'

'; + } } $content = str_replace($link1, '#ch', $chapter->content); $content = str_replace($link2, '#top', $content); diff --git a/mod/book/tool/print/locallib.php b/mod/book/tool/print/locallib.php index 200bee7..27838a9 100644 --- a/mod/book/tool/print/locallib.php +++ b/mod/book/tool/print/locallib.php @@ -60,11 +60,7 @@ function booktool_print_get_toc($chapters, $book, $cm) { $toc .= html_writer::tag('a', '', array('name' => 'toc')); // Representation of toc (HTML). - if ($book->customtitles) { - $toc .= html_writer::tag('h1', get_string('toc', 'mod_book')); - } else { - $toc .= html_writer::tag('p', get_string('toc', 'mod_book'), array('class' => 'book_chapter_title')); - } + $toc .= html_writer::tag('h2', get_string('toc', 'mod_book'), array('class' => 'book_chapter_title')); $toc .= html_writer::start_tag('ul'); foreach ($chapters as $ch) { if (!$ch->hidden) { -- 1.7.9.5 From ec5c45c4edc550825e63fb648b11426881f9bc05 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Mon, 10 Sep 2012 14:45:44 +0800 Subject: [PATCH 652/903] MDL-33198 book: Adding h tags to book title to increase accessibility --- mod/book/view.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/book/view.php b/mod/book/view.php index f5643d3..91b83b8 100644 --- a/mod/book/view.php +++ b/mod/book/view.php @@ -181,11 +181,12 @@ if (!$book->customtitles) { $hidden = $chapter->hidden ? 'dimmed_text' : ''; if (!$chapter->subchapter) { $currtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context); - echo '

'.$currtitle.'

'; + echo $OUTPUT->heading($currtitle, 2, array('class' => 'book_chapter_title '.$hidden)); } else { $currtitle = book_get_chapter_title($chapters[$chapter->id]->parent, $chapters, $book, $context); $currsubtitle = book_get_chapter_title($chapter->id, $chapters, $book, $context); - echo '

'.$currtitle.'
'.$currsubtitle.'

'; + echo $OUTPUT->heading($currtitle, 2, array('class' => 'book_chapter_title '.$hidden)); + echo $OUTPUT->heading($currsubtitle, 3, array('class' => 'book_chapter_title '.$hidden)); } } $chaptertext = file_rewrite_pluginfile_urls($chapter->content, 'pluginfile.php', $context->id, 'mod_book', 'chapter', $chapter->id); -- 1.7.9.5 From 97b53d6c05baf92874e63dc75c15f65beec2187e Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 18 Sep 2012 14:49:52 +0800 Subject: [PATCH 653/903] MDL-35398: Quick grading feedback is now pushed to the gradebook --- mod/assign/locallib.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index e1e5104..7bed4c1 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -2623,21 +2623,29 @@ class assign { } $currentgrades->close(); + $adminconfig = $this->get_admin_config(); + $gradebookplugin = $adminconfig->feedback_plugin_for_gradebook; + // ok - ready to process the updates foreach ($modifiedusers as $userid => $modified) { $grade = $this->get_user_grade($userid, true); $grade->grade= grade_floatval(unformat_float($modified->grade)); $grade->grader= $USER->id; - $this->update_grade($grade); - // save plugins data foreach ($this->feedbackplugins as $plugin) { if ($plugin->is_visible() && $plugin->is_enabled() && $plugin->supports_quickgrading()) { $plugin->save_quickgrading_changes($userid, $grade); + if (('assignfeedback_' . $plugin->get_type()) == $gradebookplugin) { + // This is the feedback plugin chose to push comments to the gradebook. + $grade->feedbacktext = $plugin->text_for_gradebook($grade); + $grade->feedbackformat = $plugin->format_for_gradebook($grade); + } } } + $this->update_grade($grade); + // save outcomes if ($CFG->enableoutcomes) { $data = array(); -- 1.7.9.5 From 6d3249780b401d7864ba61b57f55b4290f811e69 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 6 Sep 2012 13:24:37 +0800 Subject: [PATCH 654/903] MDL-30909 Accessibility: Improved access to reply form in forums --- mod/forum/lib.php | 2 +- mod/forum/post.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 4556123..e12f066 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -3344,7 +3344,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa } if ($reply) { - $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('reply'=>$post->id)), 'text'=>$str->reply); + $commands[] = array('url'=>new moodle_url('/mod/forum/post.php#mform1', array('reply'=>$post->id)), 'text'=>$str->reply); } if ($CFG->enableportfolios && ($cm->cache->caps['mod/forum:exportpost'] || ($ownpost && $cm->cache->caps['mod/forum:exportownpost']))) { diff --git a/mod/forum/post.php b/mod/forum/post.php index a71d7d1..51b837e 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -528,8 +528,10 @@ if ($USER->id != $post->userid) { // Not the original author, so add a message unset($data); } +$formheading = ''; if (!empty($parent)) { $heading = get_string("yourreply", "forum"); + $formheading = get_string('reply', 'forum'); } else { if ($forum->type == 'qanda') { $heading = get_string('yournewquestion', 'forum'); @@ -883,6 +885,9 @@ if (!empty($parent)) { } } +if (!empty($formheading)) { + echo $OUTPUT->heading($formheading, 2, array('class' => 'accesshide')); +} $mform_post->display(); echo $OUTPUT->footer(); -- 1.7.9.5 From ce86eb4d0833ce23b16b5a9a1ec47db81e6a90bb Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 18 Sep 2012 15:27:58 +0800 Subject: [PATCH 655/903] MDL-35202: Allow for language files that contain non-ascii for actions in assignment --- mod/assign/locallib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index e1e5104..a1e24b4 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -319,18 +319,18 @@ class assign { $this->process_batch_grading_operation(); $action = 'grading'; } else if ($action == 'submitgrade') { - if (optional_param('saveandshownext', null, PARAM_ALPHA)) { + if (optional_param('saveandshownext', null, PARAM_RAW)) { //save and show next $action = 'grade'; if ($this->process_save_grade($mform)) { $action = 'nextgrade'; } - } else if (optional_param('nosaveandprevious', null, PARAM_ALPHA)) { + } else if (optional_param('nosaveandprevious', null, PARAM_RAW)) { $action = 'previousgrade'; - } else if (optional_param('nosaveandnext', null, PARAM_ALPHA)) { + } else if (optional_param('nosaveandnext', null, PARAM_RAW)) { //show next button $action = 'nextgrade'; - } else if (optional_param('savegrade', null, PARAM_ALPHA)) { + } else if (optional_param('savegrade', null, PARAM_RAW)) { //save changes button $action = 'grade'; if ($this->process_save_grade($mform)) { -- 1.7.9.5 From 45a6d31c4f9fec79066e2dc3f8ca198f31817b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 18 Sep 2012 09:10:42 +0200 Subject: [PATCH 656/903] MDL-32572 always lookpup passwords only in records from current auth plugin This bug should not be creating any problems thanks to our design of login process, but it should be fixed anyway. --- auth/db/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/db/auth.php b/auth/db/auth.php index 5709513..fb0b95a 100644 --- a/auth/db/auth.php +++ b/auth/db/auth.php @@ -65,7 +65,7 @@ class auth_plugin_db extends auth_plugin_base { $authdb->Close(); // user exists externally // check username/password internally - if ($user = $DB->get_record('user', array('username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) { + if ($user = $DB->get_record('user', array('username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id, 'auth'=>$this->authtype))) { return validate_internal_user_password($user, $password); } } else { -- 1.7.9.5 From 9ac00a5394ab2973e36235bdf2fa69dee6a05f94 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 11 Sep 2012 13:04:09 +0800 Subject: [PATCH 657/903] MDL-30833 Accessibility: Added aria-expanded attribute on navigation nodes --- blocks/navigation/renderer.php | 4 +++- blocks/navigation/yui/navigation/navigation.js | 6 ++++++ blocks/settings/renderer.php | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/blocks/navigation/renderer.php b/blocks/navigation/renderer.php index 4c3d28c..92e2831 100644 --- a/blocks/navigation/renderer.php +++ b/blocks/navigation/renderer.php @@ -121,18 +121,20 @@ class block_navigation_renderer extends plugin_renderer_base { // this applies to the li item which contains all child lists too $liclasses = array($item->get_css_type(), 'depth_'.$depth); + $liexpandable = array(); if ($item->has_children() && (!$item->forceopen || $item->collapse)) { $liclasses[] = 'collapsed'; } if ($isbranch) { $liclasses[] = 'contains_branch'; + $liexpandable = array('aria-expanded' => in_array('collapsed', $liclasses) ? "false" : "true"); } else if ($hasicon) { $liclasses[] = 'item_with_icon'; } if ($item->isactive === true) { $liclasses[] = 'current_branch'; } - $liattr = array('class'=>join(' ',$liclasses)); + $liattr = array('class' => join(' ',$liclasses)) + $liexpandable; // class attribute on the div item which only contains the item content $divclasses = array('tree_item'); if ($isbranch) { diff --git a/blocks/navigation/yui/navigation/navigation.js b/blocks/navigation/yui/navigation/navigation.js index 180977d..2189d51 100644 --- a/blocks/navigation/yui/navigation/navigation.js +++ b/blocks/navigation/yui/navigation/navigation.js @@ -162,16 +162,20 @@ TREE.prototype = { switch (e.action) { case 'expand' : target.removeClass('collapsed'); + target.set('aria-expanded', true); break; case 'collapse' : target.addClass('collapsed'); + target.set('aria-expanded', false); break; default : target.toggleClass('collapsed'); + target.set('aria-expanded', !target.hasClass('collapsed')); } e.halt(); } else { target.toggleClass('collapsed'); + target.set('aria-expanded', !target.hasClass('collapsed')); } } @@ -180,6 +184,7 @@ TREE.prototype = { target.siblings('li').each(function(){ if (this.get('id') !== target.get('id') && !this.hasClass('collapsed')) { this.addClass('collapsed'); + this.set('aria-expanded', false); } }); } @@ -287,6 +292,7 @@ BRANCH.prototype = { } if (isbranch) { branchli.addClass('collapsed').addClass('contains_branch'); + branchli.set('aria-expanded', false); branchp.addClass('branch'); } diff --git a/blocks/settings/renderer.php b/blocks/settings/renderer.php index 41cea87..a19d41e 100644 --- a/blocks/settings/renderer.php +++ b/blocks/settings/renderer.php @@ -40,18 +40,20 @@ class block_settings_renderer extends plugin_renderer_base { // this applies to the li item which contains all child lists too $liclasses = array($item->get_css_type()); + $liexpandable = array(); if (!$item->forceopen || (!$item->forceopen && $item->collapse) || ($item->children->count()==0 && $item->nodetype==navigation_node::NODETYPE_BRANCH)) { $liclasses[] = 'collapsed'; } if ($isbranch) { $liclasses[] = 'contains_branch'; + $liexpandable = array('aria-expanded' => in_array('collapsed', $liclasses) ? "false" : "true"); } else if ($hasicon) { $liclasses[] = 'item_with_icon'; } if ($item->isactive === true) { $liclasses[] = 'current_branch'; } - $liattr = array('class'=>join(' ',$liclasses)); + $liattr = array('class' => join(' ',$liclasses)) + $liexpandable; // class attribute on the div item which only contains the item content $divclasses = array('tree_item'); if ($isbranch) { -- 1.7.9.5 From 3f22e75663be77f39afd591016ce7b0a75ddfd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 18 Sep 2012 10:44:05 +0200 Subject: [PATCH 658/903] MDL-32572 skip problematic users in auth_db sync --- auth/db/auth.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/auth/db/auth.php b/auth/db/auth.php index fb0b95a..6e29147 100644 --- a/auth/db/auth.php +++ b/auth/db/auth.php @@ -346,7 +346,7 @@ class auth_plugin_db extends auth_plugin_base { if ($verbose) { mtrace(get_string('auth_dbuserstoadd','auth_db',count($add_users))); } - $transaction = $DB->start_delegated_transaction(); + // Do not use transactions around this foreach, we want to skip problematic users, not revert everything. foreach($add_users as $user) { $username = $user; $user = $this->get_userinfo_asobj($user); @@ -372,9 +372,16 @@ class auth_plugin_db extends auth_plugin_base { } else { $user->timecreated = time(); $user->timemodified = $user->timecreated; - $id = $DB->insert_record ('user', $user); // it is truly a new user - if ($verbose) { - mtrace("\t".get_string('auth_dbinsertuser', 'auth_db', array('name'=>$user->username, 'id'=>$id))); + try { + $id = $DB->insert_record('user', $user); // it is truly a new user + if ($verbose) { + mtrace("\t".get_string('auth_dbinsertuser', 'auth_db', array('name'=>$user->username, 'id'=>$id))); + } + } catch (moodle_exception $e) { + if ($verbose) { + mtrace("\t".get_string('auth_dbinsertusererror', 'auth_db', $user->username)); + } + continue; } // if relevant, tag for password generation if ($this->is_internal()) { @@ -383,7 +390,6 @@ class auth_plugin_db extends auth_plugin_base { } } } - $transaction->allow_commit(); unset($add_users); // free mem } return 0; -- 1.7.9.5 From 88fbc9a7ef5d6d99cdab6913868ccfda80ded6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 18 Sep 2012 13:17:35 +0200 Subject: [PATCH 659/903] MDL-32572 fix notice when changing internal auth_db passwords --- auth/db/auth.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/auth/db/auth.php b/auth/db/auth.php index 6e29147..5882bcf 100644 --- a/auth/db/auth.php +++ b/auth/db/auth.php @@ -191,8 +191,16 @@ class auth_plugin_db extends auth_plugin_base { * @return bool True on success */ function user_update_password($user, $newpassword) { + global $DB; + if ($this->is_internal()) { - return update_internal_user_password($user, $newpassword); + $puser = $DB->get_record('user', array('id'=>$user->id), '*', MUST_EXIST); + if (update_internal_user_password($puser, $newpassword)) { + $user->password = $puser->password; + return true; + } else { + return false; + } } else { // we should have never been called! return false; -- 1.7.9.5 From 119b5fdc8b32b20e41551e69611f11f7b877536f Mon Sep 17 00:00:00 2001 From: Simon Coggins Date: Wed, 19 Sep 2012 09:07:33 +1200 Subject: [PATCH 660/903] MDL-35472: Prevent html tags appearing in page titles Only a problem when formatstringstriptags is disabled --- lib/pagelib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pagelib.php b/lib/pagelib.php index 36172c7..ba0c596 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -1073,6 +1073,7 @@ class moodle_page { */ public function set_title($title) { $title = format_string($title); + $title = strip_tags($title); $title = str_replace('"', '"', $title); $this->_title = $title; } -- 1.7.9.5 From b04027c0cf0495b59ee515ff950eba5708465a21 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 19 Sep 2012 00:51:22 +0200 Subject: [PATCH 661/903] MDL-33166 Forum: whitespace fix --- mod/forum/db/access.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php index e14c65b..43151c6 100644 --- a/mod/forum/db/access.php +++ b/mod/forum/db/access.php @@ -343,6 +343,6 @@ $capabilities = array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW ) - ), + ), ); -- 1.7.9.5 From 9b65e5841e2811453c8b8f515e257fca359ab0a6 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 19 Sep 2012 00:34:24 +0000 Subject: [PATCH 662/903] Automatically generated installer lang files --- install/lang/pt/admin.php | 6 ++---- install/lang/pt/error.php | 2 +- install/lang/pt/install.php | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/install/lang/pt/admin.php b/install/lang/pt/admin.php index beeead1..09bd68f 100644 --- a/install/lang/pt/admin.php +++ b/install/lang/pt/admin.php @@ -32,13 +32,11 @@ defined('MOODLE_INTERNAL') || die(); $string['clianswerno'] = 'n'; $string['cliansweryes'] = 's'; -$string['cliincorrectvalueerror'] = 'Erro. Valor "{$a->value}" incorreto para "{$a->option}"'; +$string['cliincorrectvalueerror'] = 'Erro: o valor "{$a->value}" não é permitido para a opção "{$a->option}"'; $string['cliincorrectvalueretry'] = 'Valor incorreto, por favor tente novamente'; $string['clitypevalue'] = 'valor do tipo'; $string['clitypevaluedefault'] = 'valor do tipo, pressione a tecla Enter para usar o valor predefinido ({$a})'; -$string['cliunknowoption'] = 'Opções desconhecidas: -{$a} -Por favor use a opção --help'; +$string['cliunknowoption'] = 'Opções desconhecidas: {$a} Por favor use a opção --help'; $string['cliyesnoprompt'] = 'digite s (para sim) ou n (para não)'; $string['environmentrequireinstall'] = 'deve estar instalada e ativa'; $string['environmentrequireversion'] = 'é requerida a versão {$a->needed} e está a correr a versão {$a->current}'; diff --git a/install/lang/pt/error.php b/install/lang/pt/error.php index 05bdef95..23e90d0 100644 --- a/install/lang/pt/error.php +++ b/install/lang/pt/error.php @@ -42,7 +42,7 @@ $string['componentisuptodate'] = 'O componente está atualizado.'; $string['downloadedfilecheckfailed'] = 'A verificação do ficheiro descarregado falhou.'; $string['invalidmd5'] = 'md5 inválido'; $string['missingrequiredfield'] = 'Um dos campos obrigatórios está em falta'; -$string['remotedownloaderror'] = 'O download do componente para o servidor falhou. Verifique as configurações do proxy. A instalação da extensão cURL do PHP é muito recomendada.

Terá que descarregar o ficheiro {$a->url} manualmente, copiá-lo para a pasta "{$a->dest}" no seu servidor e descompactá-lo.'; +$string['remotedownloaderror'] = 'A descarga do componente para o servidor falhou. Verifique as configurações do proxy. A instalação da extensão cURL do PHP é muito recomendada.

Terá que descarregar o ficheiro {$a->url} manualmente, copiá-lo para a pasta "{$a->dest}" no seu servidor e descompactá-lo.'; $string['wrongdestpath'] = 'Caminho de destino errado.'; $string['wrongsourcebase'] = 'Base do URL de origem errada'; $string['wrongzipfilename'] = 'Nome de ficheiro ZIP errado.'; diff --git a/install/lang/pt/install.php b/install/lang/pt/install.php index c2d95ef..7abb930 100644 --- a/install/lang/pt/install.php +++ b/install/lang/pt/install.php @@ -48,14 +48,14 @@ $string['environmenthead'] = 'A verificar sistema...'; $string['environmentsub2'] = 'Cada nova versão do Moodle tem pré-requisitos mínimos relativamente à versão do PHP e extensões necessárias para o seu correto funcionamento. Estes pré-requisitos são verificados sempre que o Moodle é instalado ou atualizado. Contacte o administrador do servidor caso seja necessário atualizar a versão do PHP ou instalar novas extensões.'; $string['errorsinenvironment'] = 'A verificação do sistema falhou!'; $string['installation'] = 'Instalação'; -$string['langdownloaderror'] = 'Não foi possível instalar o idioma {$a} por falha no download. O processo de instalação continuará em Inglês.'; +$string['langdownloaderror'] = 'Não foi possível instalar o idioma {$a} por falha na descarga. O processo de instalação continuará em Inglês.'; $string['memorylimithelp'] = '

O limite de memória para o PHP definido atualmente no servidor é {$a}.

Um número elevado de módulos em utilização ou de utilizadores registados pode fazer com que o Moodle apresente problemas de falta de memória.

É recomendado que o PHP seja configurado com um limite de memória de pelo menos 40MB. Esta configuração pode ser definida de diversas formas:

  1. Compilação do PHP com o parâmetro --enable-memory-limit. Esta definição permitirá ao próprio Moodle definir o valor a utilizar.
  2. Alteração do parâmetro memory_limit no ficheiro de configuração do PHP para um valor igual ou superior a 40MB.
  3. Criação de um ficheiro .htaccess na raiz da pasta do Moodle com a linha php_value memory_limit 40M

    ATENÇÃO: Em alguns servidores esta configuração impedirá o funcionamento de todas as páginas PHP. Nestes casos, não poderá ser utilizado o ficheiro .htaccess.

'; $string['paths'] = 'Caminhos'; $string['pathserrcreatedataroot'] = 'O programa de instalação não conseguiu criar a pasta de dados {$a->dataroot}.'; $string['pathshead'] = 'Confirmar caminhos'; $string['pathsrodataroot'] = 'A pasta de dados não tem permissões de escrita.'; $string['pathsroparentdataroot'] = 'A pasta pai {$a->parent} não tem permissões de escrita. O programa de instalação não conseguiu criar a pasta {$a->dataroot}.'; -$string['pathssubadmindir'] = 'Alguns servidores Web utilizam a pasta admin em URL\'s especiais de acesso a funcionalidades especiais, como é o caso de painéis de controlo. Algumas situações podem criar conflitos com a localização normal das páginas de administração do Moodle. Estes problemas podem ser resolvidos renomeando a pasta admin na instalação do Moodle e indicando aqui o novo nome a utilizar. Por exemplo:

moodleadmin

Esta ação resolverá os problemas de acesso dos links para as funcionalidades de administração do Moodle.'; +$string['pathssubadmindir'] = 'Alguns servidores Web utilizam a pasta admin em URLs especiais de acesso a funcionalidades especiais, como é o caso de painéis de controlo. Algumas situações podem criar conflitos com a localização normal das páginas de administração do Moodle. Estes problemas podem ser resolvidos renomeando a pasta admin na instalação do Moodle e indicando aqui o novo nome a utilizar. Por exemplo:

moodleadmin

Esta ação resolverá os problemas de acesso dos links para as funcionalidades de administração do Moodle.'; $string['pathssubdataroot'] = 'É necessária uma pasta onde o Moodle possa gravar os ficheiros enviados para a plataforma. Esta pasta deve ter permissão de leitura e escrita pelo utilizador do web server (normalmente nobody ou apache). Por razões de segurança esta pasta não deve estar diretamente acessível através da Internet.'; $string['pathssubdirroot'] = 'Caminho completo para a pasta de instalação do Moodle.'; $string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redireccionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranets, então este endereço deve ser configurado no DNS de forma a que os utilizadores das Intranets possam usar este endereço público para aceder ao Moodle. Se o endereço não está correto, então altere o endereço indicado no browser para reiniciar a instalação com o URL correto.'; -- 1.7.9.5 From 2ed38452aa126a59c0ae845d8f3ec7b66ad43436 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 19 Sep 2012 21:39:58 +0200 Subject: [PATCH 663/903] MDL-33166 forum: fetch cmid to be used by capability checks. --- mod/forum/lib.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index db3756c..9c3e801 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -4624,8 +4624,9 @@ function forum_is_subscribed($userid, $forum) { $forum = $DB->get_record('forum', array('id' => $forum)); } // If forum is force subscribed and has allowforcesubscribe, then user is subscribed. - if (forum_is_forcesubscribed($forum) && - has_capability('mod/forum:allowforcesubscribe', context_module::instance($forum->id), $userid)) { + $cm = get_coursemodule_from_instance('forum', $forum->id); + if (forum_is_forcesubscribed($forum) && $cm && + has_capability('mod/forum:allowforcesubscribe', context_module::instance($cm->id), $userid)) { return true; } return $DB->record_exists("forum_subscriptions", array("userid" => $userid, "forum" => $forum->id)); @@ -6118,16 +6119,21 @@ function forum_user_role_assigned($cp) { return; } - $sql = "SELECT f.id + $sql = "SELECT f.id, cm.id AS cmid FROM {forum} f + JOIN {course_modules} cm ON (cm.instance = f.id) + JOIN {modules} m ON (m.id = cm.module) LEFT JOIN {forum_subscriptions} fs ON (fs.forum = f.id AND fs.userid = :userid) - WHERE f.course = :courseid AND f.forcesubscribe = :initial AND fs.id IS NULL"; + WHERE f.course = :courseid + AND f.forcesubscribe = :initial + AND m.name = 'forum' + AND fs.id IS NULL"; $params = array('courseid'=>$context->instanceid, 'userid'=>$cp->userid, 'initial'=>FORUM_INITIALSUBSCRIBE); $forums = $DB->get_records_sql($sql, $params); foreach ($forums as $forum) { // If user doesn't have allowforcesubscribe capability then don't subscribe. - if (has_capability('mod/forum:allowforcesubscribe', context_module::instance($forum->id), $cp->userid)) { + if (has_capability('mod/forum:allowforcesubscribe', context_module::instance($forum->cmid), $cp->userid)) { forum_subscribe($cp->userid, $forum->id); } } -- 1.7.9.5 From 5fc1b61a88a9ab322e613445da1c4f078a3e765d Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 20 Sep 2012 00:34:31 +0000 Subject: [PATCH 664/903] Automatically generated installer lang files --- install/lang/fi/admin.php | 2 +- install/lang/fi/error.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/lang/fi/admin.php b/install/lang/fi/admin.php index ca02ff8..99e609e 100644 --- a/install/lang/fi/admin.php +++ b/install/lang/fi/admin.php @@ -38,5 +38,5 @@ $string['clitypevalue'] = 'syötä arvo'; $string['clitypevaluedefault'] = 'syötä arvo, paina Enteriä käyttääksesi oletusarvoa ({$a})'; $string['cliunknowoption'] = 'Tunnistamaton valinta: {$a} Ole hyvä ja käytä --help -valintaa.'; $string['cliyesnoprompt'] = 'syötä y (kyllä) tai n (ei)'; -$string['environmentrequireinstall'] = 'vaaditaan asennettavaksi/käyttöönotettavaksi'; +$string['environmentrequireinstall'] = 'pitää olla asennettuna ja käytössä'; $string['environmentrequireversion'] = 'versio {$a->needed} vaaditaan ja käytössä on versio {$a->current}'; diff --git a/install/lang/fi/error.php b/install/lang/fi/error.php index 8b7de2a..d15d0be 100644 --- a/install/lang/fi/error.php +++ b/install/lang/fi/error.php @@ -30,18 +30,18 @@ defined('MOODLE_INTERNAL') || die(); -$string['cannotcreatelangdir'] = 'Kielihakemistoa ei voitu luoda'; +$string['cannotcreatelangdir'] = 'Kielihakemistoa ei voida luoda'; $string['cannotcreatetempdir'] = 'Temp-hakemistoa ei voitu luoda'; $string['cannotdownloadcomponents'] = 'Komponentteja ei voitu ladata'; $string['cannotdownloadzipfile'] = 'ZIP-tiedostoa ei voitu ladata'; $string['cannotfindcomponent'] = 'Komponenttia ei löytynyt'; $string['cannotsavemd5file'] = 'MD5-tiedostoa ei voitu tallentaa'; -$string['cannotsavezipfile'] = 'Zip-tiedosta ei voitu tallentaa'; +$string['cannotsavezipfile'] = 'Zip-tiedostoa ei voitu tallentaa'; $string['cannotunzipfile'] = 'Zip-tiedostoa ei voitu purkaa'; $string['componentisuptodate'] = 'Komponentti on ajan tasalla'; $string['downloadedfilecheckfailed'] = 'Ladatun tiedoston tarkistus epäonnistui'; -$string['invalidmd5'] = 'Virheellinen MD5'; -$string['missingrequiredfield'] = 'JOitakin vaadituista kentistä puuttuu'; +$string['invalidmd5'] = 'Tarkistusmuuttuja oli väärin - yritä uudelleen'; +$string['missingrequiredfield'] = 'Joitakin vaadituista kentistä puuttuu'; $string['remotedownloaderror'] = 'Komponentin lataaminen palvelimelle epäonnistui, ole hyvä ja varmista välityspalvelimen asetukset, PHP cURL -laajennus on suositeltu.

Sinun täytyy ladata {$a->url} -tiedosto manuaalisesti, kopioi se kohteeseen "{$a->dest}" serverilläsi ja pura se sinne.'; $string['wrongdestpath'] = 'Virheellinen kohdekansio'; $string['wrongsourcebase'] = 'Väärä lähteen web-osoitteen kanta'; -- 1.7.9.5 From c366bea3cfc5229717d9fff59197d336306d758b Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 20 Sep 2012 14:10:34 +0800 Subject: [PATCH 665/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index d032d57..601517c 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.01; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.02; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20120914)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20120920)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From ed7e6a735663de70df69d4d759550cbf11383a3d Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 20 Sep 2012 15:47:52 +0800 Subject: [PATCH 666/903] MDL-33857 Increase performance of queries for Server files repository (small improvements) --- lib/filebrowser/file_info.php | 39 ++++++++------- lib/filebrowser/file_info_context_course.php | 59 ++++++++++++++--------- lib/filebrowser/file_info_context_coursecat.php | 54 +++++++++++++-------- lib/filebrowser/file_info_context_module.php | 20 ++++---- lib/filebrowser/file_info_stored.php | 30 +++++++++--- mod/book/locallib.php | 17 +++---- mod/data/locallib.php | 17 +++---- mod/forum/locallib.php | 17 +++---- mod/glossary/locallib.php | 17 +++---- mod/imscp/locallib.php | 21 ++++---- mod/workshop/fileinfolib.php | 19 +++++--- repository/local/lib.php | 17 +++---- 12 files changed, 183 insertions(+), 144 deletions(-) diff --git a/lib/filebrowser/file_info.php b/lib/filebrowser/file_info.php index 9ad0364..0900d68 100644 --- a/lib/filebrowser/file_info.php +++ b/lib/filebrowser/file_info.php @@ -143,7 +143,7 @@ abstract class file_info { $nonemptylist[] = $fileinfo; } else { $filename = $fileinfo->get_visible_name(); - $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); + $extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION)); if (!empty($extension) && in_array('.'.$extension, $extensions)) { $nonemptylist[] = $fileinfo; } @@ -156,7 +156,7 @@ abstract class file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 + * We usually don't need the exact number of non empty children if it is >=2 (see param $limit) * This function is used by repository_local to evaluate if the folder is empty. But * it also can be used to check if folder has only one subfolder because in some cases * this subfolder can be skipped. @@ -166,27 +166,32 @@ abstract class file_info { * and memory usage on big sites). * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { + public function count_non_empty_children($extensions = '*', $limit = 1) { $list = $this->get_children(); $cnt = 0; + // first loop through files foreach ($list as $fileinfo) { - if ($cnt > 1) { - // it only matters if it is 0, 1 or 2+ - return $cnt; - } - if ($fileinfo->is_directory()) { - if ($fileinfo->count_non_empty_children($extensions)) { - $cnt++; + if (!$fileinfo->is_directory()) { + if ($extensions !== '*') { + $filename = $fileinfo->get_visible_name(); + $extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION)); + if (empty($extension) || !in_array('.'.$extension, $extensions)) { + continue; + } } - } else if ($extensions === '*') { - $cnt++; - } else { - $filename = $fileinfo->get_visible_name(); - $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); - if (!empty($extension) && in_array('.'.$extension, $extensions)) { - $cnt++; + if ((++$cnt) >= $limit) { + return $cnt; + } + } + } + // now loop through directories + foreach ($list as $fileinfo) { + if ($fileinfo->is_directory() && $fileinfo->count_non_empty_children($extensions)) { + if ((++$cnt) >= $limit) { + return $cnt; } } } diff --git a/lib/filebrowser/file_info_context_course.php b/lib/filebrowser/file_info_context_course.php index 0ee7402..c88740a 100644 --- a/lib/filebrowser/file_info_context_course.php +++ b/lib/filebrowser/file_info_context_course.php @@ -357,7 +357,8 @@ class file_info_context_course extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -375,8 +376,8 @@ class file_info_context_course extends file_info { if ($child = $this->get_file_info($area[0], $area[1], 0, '/', '.')) { if ($returnemptyfolders || $child->count_non_empty_children($extensions)) { $children[] = $child; - if ($countonly && count($children)>1) { - return 2; + if (($countonly !== false) && count($children)>=$countonly) { + return $countonly; } } } @@ -396,15 +397,15 @@ class file_info_context_course extends file_info { if ($child = $this->browser->get_file_info($modcontext)) { if ($returnemptyfolders || $child->count_non_empty_children($extensions)) { $children[] = $child; - if ($countonly && count($children)>1) { - return 2; + if (($countonly !== false) && count($children)>=$countonly) { + return $countonly; } } } } } - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -425,14 +426,12 @@ class file_info_context_course extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** @@ -535,7 +534,7 @@ class file_info_area_course_legacy extends file_info_stored { $storedfiles = $fs->get_directory_files($this->context->id, 'course', 'legacy', 0, $this->lf->get_filepath(), false, true, "filepath, filename"); foreach ($storedfiles as $file) { - $extension = strtolower(pathinfo($file->get_filename(), PATHINFO_EXTENSION)); + $extension = textlib::strtolower(pathinfo($file->get_filename(), PATHINFO_EXTENSION)); if ($file->is_directory() || $extensions === '*' || (!empty($extension) && in_array('.'.$extension, $extensions))) { $fileinfo = new file_info_area_course_legacy($this->browser, $this->context, $file, $this->urlbase, $this->topvisiblename, $this->itemidused, $this->readaccess, $this->writeaccess, false); @@ -656,13 +655,11 @@ class file_info_area_course_section extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { + public function count_non_empty_children($extensions = '*', $limit = 1) { global $DB; $params1 = array( 'courseid' => $this->course->id, @@ -670,7 +667,7 @@ class file_info_area_course_section extends file_info { 'component' => 'course', 'filearea' => 'section', 'emptyfilename' => '.'); - $sql1 = "SELECT 1 from {files} f, {course_sections} cs + $sql1 = "SELECT DISTINCT cs.id FROM {files} f, {course_sections} cs WHERE cs.course = :courseid AND f.contextid = :contextid AND f.component = :component @@ -678,7 +675,15 @@ class file_info_area_course_section extends file_info { AND f.itemid = cs.id AND f.filename <> :emptyfilename"; list($sql2, $params2) = $this->build_search_files_sql($extensions); - return $DB->record_exists_sql($sql1.' '.$sql2, array_merge($params1, $params2)) ? 2 : 0; + $rs = $DB->get_recordset_sql($sql1. ' '. $sql2, array_merge($params1, $params2)); + $cnt = 0; + foreach ($rs as $record) { + if ((++$cnt) >= $limit) { + break; + } + } + $rs->close(); + return $cnt; } /** @@ -796,13 +801,11 @@ class file_info_area_backup_section extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { + public function count_non_empty_children($extensions = '*', $limit = 1) { global $DB; $params1 = array( 'courseid' => $this->course->id, @@ -810,7 +813,7 @@ class file_info_area_backup_section extends file_info { 'component' => 'backup', 'filearea' => 'section', 'emptyfilename' => '.'); - $sql1 = "SELECT 1 from {files} f, {course_sections} cs + $sql1 = "SELECT DISTINCT cs.id sectionid FROM {files} f, {course_sections} cs WHERE cs.course = :courseid AND f.contextid = :contextid AND f.component = :component @@ -818,7 +821,15 @@ class file_info_area_backup_section extends file_info { AND f.itemid = cs.id AND f.filename <> :emptyfilename"; list($sql2, $params2) = $this->build_search_files_sql($extensions); - return $DB->record_exists_sql($sql1.' '.$sql2, array_merge($params1, $params2)) ? 2 : 0; + $rs = $DB->get_recordset_sql($sql1. ' '. $sql2, array_merge($params1, $params2)); + $cnt = 0; + foreach ($rs as $record) { + if ((++$cnt) >= $limit) { + break; + } + } + $rs->close(); + return $cnt; } /** diff --git a/lib/filebrowser/file_info_context_coursecat.php b/lib/filebrowser/file_info_context_coursecat.php index 97e3d91..e8d542c 100644 --- a/lib/filebrowser/file_info_context_coursecat.php +++ b/lib/filebrowser/file_info_context_coursecat.php @@ -192,44 +192,60 @@ class file_info_context_coursecat extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { + public function count_non_empty_children($extensions = '*', $limit = 1) { global $DB; + $cnt = 0; if (($child = $this->get_area_coursecat_description(0, '/', '.')) - && $child->count_non_empty_children($extensions)) { - return 2; + && $child->count_non_empty_children($extensions) && (++$cnt) >= $limit) { + return $cnt; } - $course_cats = $DB->get_records('course_categories', array('parent'=>$this->category->id), 'sortorder', 'id,visible'); - foreach ($course_cats as $category) { - $context = context_coursecat::instance($category->id); - if (!$category->visible and !has_capability('moodle/category:viewhiddencategories', $context)) { + $rs = $DB->get_recordset_sql('SELECT ctx.id contextid, c.visible + FROM {context} ctx, {course} c + WHERE ctx.instanceid = c.id + AND ctx.contextlevel = :courselevel + AND c.category = :categoryid + ORDER BY c.visible DESC', // retrieve visible courses first + array('categoryid' => $this->category->id, 'courselevel' => CONTEXT_COURSE)); + foreach ($rs as $record) { + $context = context::instance_by_id($record->contextid); + if (!$record->visible and !has_capability('moodle/course:viewhiddencourses', $context)) { continue; } if (($child = $this->browser->get_file_info($context)) - && $child->count_non_empty_children($extensions)) { - return 2; + && $child->count_non_empty_children($extensions) && (++$cnt) >= $limit) { + break; } } + $rs->close(); + if ($cnt >= $limit) { + return $cnt; + } - $courses = $DB->get_records('course', array('category'=>$this->category->id), 'sortorder', 'id,visible'); - foreach ($courses as $course) { - $context = context_course::instance($course->id); - if (!$course->visible and !has_capability('moodle/course:viewhiddencourses', $context)) { + $rs = $DB->get_recordset_sql('SELECT ctx.id contextid, cat.visible + FROM {context} ctx, {course_categories} cat + WHERE ctx.instanceid = cat.id + AND ctx.contextlevel = :catlevel + AND cat.parent = :categoryid + ORDER BY cat.visible DESC', // retrieve visible categories first + array('categoryid' => $this->category->id, 'catlevel' => CONTEXT_COURSECAT)); + foreach ($rs as $record) { + $context = context::instance_by_id($record->contextid); + if (!$record->visible and !has_capability('moodle/category:viewhiddencategories', $context)) { continue; } if (($child = $this->browser->get_file_info($context)) - && $child->count_non_empty_children($extensions)) { - return 2; + && $child->count_non_empty_children($extensions) && (++$cnt) >= $limit) { + break; } } + $rs->close(); - return 0; + return $cnt; } /** diff --git a/lib/filebrowser/file_info_context_module.php b/lib/filebrowser/file_info_context_module.php index a873737..5636503 100644 --- a/lib/filebrowser/file_info_context_module.php +++ b/lib/filebrowser/file_info_context_module.php @@ -268,7 +268,8 @@ class file_info_context_module extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -303,13 +304,13 @@ class file_info_context_module extends file_info { if ($child = $this->get_file_info($area[0], $area[1], null, null, null)) { if ($returnemptyfolders || $child->count_non_empty_children($extensions)) { $children[] = $child; - if ($countonly && count($children)>1) { + if ($countonly !== false && count($children) >= $countonly) { break; } } } } - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -319,11 +320,10 @@ class file_info_context_module extends file_info { * Returns list of children which are either files matching the specified extensions * or folders that contain at least one such file. * - * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') + * @param string|array $extensions either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') * @return array of file_info instances */ public function get_non_empty_children($extensions = '*') { - global $DB; if ($this->nonemptychildren !== null) { return $this->nonemptychildren; } @@ -335,17 +335,15 @@ class file_info_context_module extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * - * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param string|array $extensions for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - global $DB; + public function count_non_empty_children($extensions = '*', $limit = 1) { if ($this->nonemptychildren !== null) { return count($this->nonemptychildren); } - return $this->get_filtered_children($extensions, true); + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/lib/filebrowser/file_info_stored.php b/lib/filebrowser/file_info_stored.php index 1c4d2d2..e9caf4c 100644 --- a/lib/filebrowser/file_info_stored.php +++ b/lib/filebrowser/file_info_stored.php @@ -368,7 +368,7 @@ class file_info_stored extends file_info { $storedfiles = $fs->get_directory_files($this->context->id, $this->lf->get_component(), $this->lf->get_filearea(), $this->lf->get_itemid(), $this->lf->get_filepath(), false, true, "filepath, filename"); foreach ($storedfiles as $file) { - $extension = strtolower(pathinfo($file->get_filename(), PATHINFO_EXTENSION)); + $extension = textlib::strtolower(pathinfo($file->get_filename(), PATHINFO_EXTENSION)); if ($file->is_directory() || $extensions === '*' || (!empty($extension) && in_array('.'.$extension, $extensions))) { $fileinfo = new file_info_stored($this->browser, $this->context, $file, $this->urlbase, $this->topvisiblename, $this->itemidused, $this->readaccess, $this->writeaccess, false); @@ -385,13 +385,11 @@ class file_info_stored extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { + public function count_non_empty_children($extensions = '*', $limit = 1) { global $DB; if (!$this->lf->is_directory()) { return 0; @@ -399,7 +397,7 @@ class file_info_stored extends file_info { $filepath = $this->lf->get_filepath(); $length = textlib::strlen($filepath); - $sql = "SELECT 1 + $sql = "SELECT filepath, filename FROM {files} f WHERE f.contextid = :contextid AND f.component = :component AND f.filearea = :filearea AND f.itemid = :itemid AND ".$DB->sql_substr("f.filepath", 1, $length)." = :filepath @@ -410,8 +408,24 @@ class file_info_stored extends file_info { 'itemid' => $this->lf->get_itemid(), 'filepath' => $filepath); list($sql2, $params2) = $this->build_search_files_sql($extensions); - // we don't need to check access to individual files here, since the user can access parent - return $DB->record_exists_sql($sql.' '.$sql2, array_merge($params, $params2)) ? 2 : 0; + $rs = $DB->get_recordset_sql($sql.' '.$sql2, array_merge($params, $params2)); + $children = array(); + foreach ($rs as $record) { + // we don't need to check access to individual files here, since the user can access parent + if ($record->filepath === $filepath) { + $children[] = $record->filename; + } else { + $path = explode('/', textlib::substr($record->filepath, $length)); + if (!in_array($path[0], $children)) { + $children[] = $path[0]; + } + } + if (count($children) >= $limit) { + break; + } + } + $rs->close(); + return count($children); } /** diff --git a/mod/book/locallib.php b/mod/book/locallib.php index eba2e52..9502805 100644 --- a/mod/book/locallib.php +++ b/mod/book/locallib.php @@ -455,7 +455,8 @@ class book_file_info extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -479,7 +480,7 @@ class book_file_info extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions, 'f'); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly === false) { $sql .= ' ORDER BY bc.pagenum'; } @@ -491,12 +492,12 @@ class book_file_info extends file_info { $children[] = $child; } } - if ($countonly && count($children)>1) { + if ($countonly !== false && count($children) >= $countonly) { break; } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -517,14 +518,12 @@ class book_file_info extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/mod/data/locallib.php b/mod/data/locallib.php index 16c25c7..55a2070 100644 --- a/mod/data/locallib.php +++ b/mod/data/locallib.php @@ -500,7 +500,8 @@ class data_file_info_container extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -521,7 +522,7 @@ class data_file_info_container extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly === false) { $sql .= ' ORDER BY itemid DESC'; } @@ -531,12 +532,12 @@ class data_file_info_container extends file_info { if ($child = $this->browser->get_file_info($this->context, 'mod_data', $this->filearea, $record->itemid)) { $children[] = $child; } - if ($countonly && count($children)>1) { + if ($countonly !== false && count($children) >= $countonly) { break; } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -557,14 +558,12 @@ class data_file_info_container extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/mod/forum/locallib.php b/mod/forum/locallib.php index f8840b6..406352a 100644 --- a/mod/forum/locallib.php +++ b/mod/forum/locallib.php @@ -490,7 +490,8 @@ class forum_file_info_container extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -511,7 +512,7 @@ class forum_file_info_container extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly !== false) { $sql .= ' ORDER BY itemid DESC'; } @@ -522,12 +523,12 @@ class forum_file_info_container extends file_info { && ($returnemptyfolders || $child->count_non_empty_children($extensions))) { $children[] = $child; } - if ($countonly && count($children)>1) { + if ($countonly !== false && count($children) >= $countonly) { break; } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -548,14 +549,12 @@ class forum_file_info_container extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/mod/glossary/locallib.php b/mod/glossary/locallib.php index e848138..26dee0f 100644 --- a/mod/glossary/locallib.php +++ b/mod/glossary/locallib.php @@ -547,7 +547,8 @@ class glossary_file_info_container extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -575,7 +576,7 @@ class glossary_file_info_container extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions, 'f'); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly !== false) { $sql .= ' ORDER BY ge.concept, f.itemid'; } @@ -585,12 +586,12 @@ class glossary_file_info_container extends file_info { if ($child = $this->browser->get_file_info($this->context, 'mod_glossary', $this->filearea, $record->itemid)) { $children[] = $child; } - if ($countonly && count($children)>1) { + if ($countonly !== false && count($children) >= $countonly) { break; } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -611,14 +612,12 @@ class glossary_file_info_container extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/mod/imscp/locallib.php b/mod/imscp/locallib.php index bff1b0e..04b16fb 100644 --- a/mod/imscp/locallib.php +++ b/mod/imscp/locallib.php @@ -280,7 +280,8 @@ class imscp_file_info extends file_info { * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -301,7 +302,7 @@ class imscp_file_info extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly !== false) { $sql .= ' ORDER BY itemid'; } @@ -310,13 +311,13 @@ class imscp_file_info extends file_info { foreach ($rs as $record) { if ($child = $this->browser->get_file_info($this->context, 'mod_imscp', $this->filearea, $record->itemid)) { $children[] = $child; - } - if ($countonly && count($children)>1) { - break; + if ($countonly !== false && count($children) >= $countonly) { + break; + } } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -337,14 +338,12 @@ class imscp_file_info extends file_info { * Returns the number of children which are either files matching the specified extensions * or folders containing at least one such file. * - * NOTE: We don't need the exact number of non empty children if it is >=2 - * In this function 1 is never returned to avoid skipping the single subfolder - * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/mod/workshop/fileinfolib.php b/mod/workshop/fileinfolib.php index eb1a3bf..35afd24 100644 --- a/mod/workshop/fileinfolib.php +++ b/mod/workshop/fileinfolib.php @@ -96,11 +96,13 @@ class workshop_file_info_submissions_container extends file_info { public function get_children() { return $this->get_filtered_children('*', false, true); } + /** * Help function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') - * @param bool $countonly if true returns the count of children (0, 1 or 2 if more than 1) + * @param bool|int $countonly if false returns the children, if an int returns just the + * count of children but stops counting when $countonly number of children is reached * @param bool $returnemptyfolders if true returns items that don't have matching files inside * @return array|int array of file_info instances or the count */ @@ -121,7 +123,7 @@ class workshop_file_info_submissions_container extends file_info { list($sql2, $params2) = $this->build_search_files_sql($extensions); $sql .= ' '.$sql2; $params = array_merge($params, $params2); - if (!$countonly) { + if ($countonly !== false) { $sql .= ' ORDER BY itemid DESC'; } @@ -131,13 +133,13 @@ class workshop_file_info_submissions_container extends file_info { if (($child = $this->browser->get_file_info($this->context, 'mod_workshop', $this->filearea, $record->itemid)) && ($returnemptyfolders || $child->count_non_empty_children($extensions))) { $children[] = $child; - } - if ($countonly && count($children)>1) { - break; + if ($countonly !== false && count($children) >= $countonly) { + break; + } } } $rs->close(); - if ($countonly) { + if ($countonly !== false) { return count($children); } return $children; @@ -162,10 +164,11 @@ class workshop_file_info_submissions_container extends file_info { * In this function 1 is never returned to avoid skipping the single subfolder * * @param string|array $extensions, for example '*' or array('.gif','.jpg') + * @param int $limit stop counting after at least $limit non-empty children are found * @return int */ - public function count_non_empty_children($extensions = '*') { - return $this->get_filtered_children($extensions, true); + public function count_non_empty_children($extensions = '*', $limit = 1) { + return $this->get_filtered_children($extensions, $limit); } /** diff --git a/repository/local/lib.php b/repository/local/lib.php index a0b77a5..b41100c 100644 --- a/repository/local/lib.php +++ b/repository/local/lib.php @@ -67,10 +67,7 @@ class repository_local extends repository { } } if (empty($context) && !empty($this->context)) { - list($repositorycontext, $course, $cm) = get_context_info_array($this->context->id); - if (isset($course->id)) { - $context = context_course::instance($course->id); - } + $context = $this->context->get_course_context(false); } if (empty($context)) { $context = context_system::instance(); @@ -85,7 +82,7 @@ class repository_local extends repository { if (!is_array($extensions)) { $extensions = array($extensions); } - $extensions = array_map('strtolower', $extensions); + $extensions = array_map('textlib::strtolower', $extensions); } // build file tree @@ -143,7 +140,7 @@ class repository_local extends repository { /** * Returns all children elements that have one of the specified extensions * - * This function may skip subfolers and recursively add their children + * This function may skip subfolders and recursively add their children * {@link repository_local::can_skip()} * * @param file_info $fileinfo @@ -164,7 +161,7 @@ class repository_local extends repository { } /** - * Wether this folder may be skipped in folder hierarchy + * Whether this folder may be skipped in folder hierarchy * * 1. Skip the name of a single filearea in a module * 2. Skip course categories for non-admins who do not have navshowmycoursecategories setting @@ -176,7 +173,6 @@ class repository_local extends repository { */ private function can_skip(file_info $fileinfo, $extensions, $parent = -1) { global $CFG; - static $skipcategories = null; if (!$fileinfo->is_directory()) { // do not skip files return false; @@ -196,13 +192,14 @@ class repository_local extends repository { $params = $fileinfo->get_params(); if (strlen($params['filearea']) && ($params['filepath'] === '/' || empty($params['filepath'])) && - ($params['filename'] === '.' || empty($params['filename']))) { + ($params['filename'] === '.' || empty($params['filename'])) && + context::instance_by_id($params['contextid'])->contextlevel == CONTEXT_MODULE) { if ($parent === -1) { $parent = $fileinfo->get_parent(); } // This is a filearea inside an activity, it can be skipped if it has no non-empty siblings if ($parent && ($parent instanceof file_info_context_module)) { - if ($parent->count_non_empty_children($extensions) <= 1) { + if ($parent->count_non_empty_children($extensions, 2) <= 1) { return true; } } -- 1.7.9.5 From 7116aca6aff7c950e2be05a570d4c5c4003a018f Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 13 Sep 2012 10:29:21 +0800 Subject: [PATCH 667/903] MDL-35001 removed cycle detection from convert_to_array because it causes error in data --- lib/moodlelib.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 388ded6..167a653 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -10431,17 +10431,12 @@ function object_property_exists( $obj, $property ) { */ function convert_to_array($var) { $result = array(); - $references = array(); // loop over elements/properties foreach ($var as $key => $value) { // recursively convert objects if (is_object($value) || is_array($value)) { - // but prevent cycles - if (!in_array($value, $references)) { - $result[$key] = convert_to_array($value); - $references[] = $value; - } + $result[$key] = convert_to_array($value); } else { // simple values are untouched $result[$key] = $value; -- 1.7.9.5 From 093825d81ede9260427c0938ec44c4338911da2a Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Wed, 19 Sep 2012 16:15:10 +0800 Subject: [PATCH 668/903] MDL-35001 added unit test for function convert_to_array() --- lib/tests/moodlelib_test.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php index 1abdf80..6beb856 100644 --- a/lib/tests/moodlelib_test.php +++ b/lib/tests/moodlelib_test.php @@ -1970,4 +1970,27 @@ class moodlelib_testcase extends advanced_testcase { $result = delete_user($admin); $this->assertFalse($result); } + + /** + * Test function convert_to_array() + */ + public function test_convert_to_array() { + // check that normal classes are converted to arrays the same way as (array) would do + $obj = new stdClass(); + $obj->prop1 = 'hello'; + $obj->prop2 = array('first', 'second', 13); + $obj->prop3 = 15; + $this->assertEquals(convert_to_array($obj), (array)$obj); + + // check that context object (with iterator) is converted to array properly + $obj = get_system_context(); + $ar = array( + 'id' => $obj->id, + 'contextlevel' => $obj->contextlevel, + 'instanceid' => $obj->instanceid, + 'path' => $obj->path, + 'depth' => $obj->depth + ); + $this->assertEquals(convert_to_array($obj), $ar); + } } -- 1.7.9.5 From a7783bf260d28c7ea781db36d8c657b27810554a Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 20 Sep 2012 10:21:42 +0800 Subject: [PATCH 669/903] MDL-35542 Fixed a bug when trying to directly link to a file from Dropbox --- repository/dropbox/lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/repository/dropbox/lib.php b/repository/dropbox/lib.php index 768580e..508c05e 100644 --- a/repository/dropbox/lib.php +++ b/repository/dropbox/lib.php @@ -506,6 +506,10 @@ class repository_dropbox extends repository { */ public function get_link($reference) { $ref = unserialize($reference); + if (!isset($ref->url)) { + $this->dropbox->set_access_token($ref->access_key, $ref->access_secret); + $ref->url = $this->dropbox->get_file_share_link($ref->path, self::GETFILE_TIMEOUT); + } return $this->get_file_download_link($ref->url); } -- 1.7.9.5 From 2974030611430a060025254e381248c020e60e65 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 19 Sep 2012 17:24:38 +0200 Subject: [PATCH 670/903] MDL-35517 course: Handle non-existing $course->maxbytes on course creation. --- course/edit_form.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/course/edit_form.php b/course/edit_form.php index 319bdac..20a010e 100644 --- a/course/edit_form.php +++ b/course/edit_form.php @@ -156,7 +156,11 @@ class course_edit_form extends moodleform { $mform->addHelpButton('showreports', 'showreports'); $mform->setDefault('showreports', $courseconfig->showreports); - $choices = get_max_upload_sizes($CFG->maxbytes, 0, 0, $course->maxbytes); + // Handle non-existing $course->maxbytes on course creation. + $coursemaxbytes = !isset($course->maxbytes) ? null : $course->maxbytes; + + // Let's prepare the maxbytes popup. + $choices = get_max_upload_sizes($CFG->maxbytes, 0, 0, $coursemaxbytes); $mform->addElement('select', 'maxbytes', get_string('maximumupload'), $choices); $mform->addHelpButton('maxbytes', 'maximumupload'); $mform->setDefault('maxbytes', $courseconfig->maxbytes); -- 1.7.9.5 From 7ab5b064a6a23ec79b90c747a7d45c69ec383521 Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Wed, 19 Sep 2012 12:56:08 +0100 Subject: [PATCH 671/903] MDL-35321 course sections Enable reset of grouping access --- course/editsection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/editsection.php b/course/editsection.php index e4d6bea..c307a6d 100644 --- a/course/editsection.php +++ b/course/editsection.php @@ -78,7 +78,7 @@ if ($mform->is_cancelled()){ if (!empty($CFG->enableavailability)) { $section->availablefrom = $data->availablefrom; $section->availableuntil = $data->availableuntil; - if (!empty($data->groupingid)) { + if (isset($data->groupingid)) { $section->groupingid = $data->groupingid; } $section->showavailability = $data->showavailability; -- 1.7.9.5 From 58f8b73f26c0e558d4dae5add1054bf847478cac Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Fri, 21 Sep 2012 00:34:52 +0000 Subject: [PATCH 672/903] Automatically generated installer lang files --- install/lang/fi/install.php | 4 ++-- install/lang/fo/langconfig.php | 3 ++- install/lang/fo/moodle.php | 33 +++++++++++++++++++++++++++++++++ install/lang/ko/install.php | 2 +- install/lang/pt/error.php | 2 +- 5 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 install/lang/fo/moodle.php diff --git a/install/lang/fi/install.php b/install/lang/fi/install.php index 61496e6..cffb9b0 100644 --- a/install/lang/fi/install.php +++ b/install/lang/fi/install.php @@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die(); $string['admindirname'] = 'Ylläpitohakemisto'; $string['availablelangs'] = 'Saatavilla olevat kielipaketit'; $string['chooselanguagehead'] = 'Valitse kieli'; -$string['chooselanguagesub'] = 'Valitse kieli asennusohjelmaa varten. Voit valita muita kieliä käyttöösi myöhemmin.'; +$string['chooselanguagesub'] = 'Valitse kieli asennusohjelmaa varten. Tätä kieltä käytetään sivuston oletuskielenä, jonka voi vaihtaa tarpeen mukaan. Myöhemmin voit myös lisätä käyttöön muitakin kieliä.'; $string['clialreadyconfigured'] = 'Tiedosto config.php on jo olemassa, käytä admin/cli/install_database.php -tiedostoa jos haluat asentaa tämän sivuston.'; $string['clialreadyinstalled'] = 'Tiedosto config.php on jo olemassa, ole hyvä ja käytä admin/cli/upgrade.php:ta jos haluat päivittää sivustosi'; $string['cliinstallheader'] = 'Moodlen {$a} komentoriviasennusohjelma'; @@ -43,7 +43,7 @@ $string['databasetypehead'] = 'Valitse tietokannan ajuri'; $string['dataroot'] = 'Datahakemisto'; $string['datarootpermission'] = 'Datahakemistojen oikeudet'; $string['dbprefix'] = 'Taulukon etumerkki'; -$string['dirroot'] = 'Moodle hakemisto'; +$string['dirroot'] = 'Moodle-hakemisto'; $string['environmenthead'] = 'Ympäristön tarkistus'; $string['environmentsub2'] = 'Jokaisessa Moodle-julkaisussa on joitakin vähimmäisvaatimuksia PHP-versiolta sekä joitakin pakollisia PHP-lisäosia. Ennen jokaista asennusta ja päivitystä suoritetaan täysi ympäristön tarkistus. Ole hyvä ja ota yhteyttä palvelimen ylläpitoon jos et tiedä kuinka asentaa uutta versiota tai PHP-lisäosia.'; diff --git a/install/lang/fo/langconfig.php b/install/lang/fo/langconfig.php index 9395d7d..f6af31f 100644 --- a/install/lang/fo/langconfig.php +++ b/install/lang/fo/langconfig.php @@ -30,4 +30,5 @@ defined('MOODLE_INTERNAL') || die(); -$string['thislanguage'] = 'Faroese'; +$string['thisdirection'] = 'ltr'; +$string['thislanguage'] = 'Føroyskt'; diff --git a/install/lang/fo/moodle.php b/install/lang/fo/moodle.php new file mode 100644 index 0000000..be63909 --- /dev/null +++ b/install/lang/fo/moodle.php @@ -0,0 +1,33 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['language'] = 'Tungumál'; diff --git a/install/lang/ko/install.php b/install/lang/ko/install.php index 5dfca0c..cff6e23 100644 --- a/install/lang/ko/install.php +++ b/install/lang/ko/install.php @@ -87,7 +87,7 @@ $string['welcomep20'] = '당신의 컴퓨터에 {$a->packname} {$a->pack $string['welcomep30'] = '{$a->installername} 판본은 무들이 동작하는 환경을 생성하기 위한 어플리케이션을 포함하고 있습니다.'; $string['welcomep40'] = '이 패키지는 무들 {$a->moodlerelease} ({$a->moodleversion}) 을 포함하고 있습니다.'; $string['welcomep50'] = '이 패키지에 있는 모든 어플리케이션을 사용하는 것은 각각의 라이센스에의해 지배받습니다. 완전한{$a->installername} 패키지는 -공개 소스이며 GPL 라이선스에 의해 배포됩니다.'; +공개 소스이며 GPL 라이선스에 의해 배포됩니다.'; $string['welcomep60'] = '다음 페이지들은 컴퓨터에 무들을 설치하고 설정하는 길라잡이 역할을 할 것입니다. 기본 설정을 선택하거나 목적에 맞게 선택적으로 수정할 수 있습니다.'; $string['welcomep70'] = '무들 설정을 계속하기 위해서는 "다음" 버튼을 클릭하세요.'; $string['wwwroot'] = '웹 주소'; diff --git a/install/lang/pt/error.php b/install/lang/pt/error.php index 23e90d0..e400a6c 100644 --- a/install/lang/pt/error.php +++ b/install/lang/pt/error.php @@ -40,7 +40,7 @@ $string['cannotsavezipfile'] = 'Não é possível gravar o ficheiro ZIP'; $string['cannotunzipfile'] = 'Não é possível descompactar o ficheiro ZIP'; $string['componentisuptodate'] = 'O componente está atualizado.'; $string['downloadedfilecheckfailed'] = 'A verificação do ficheiro descarregado falhou.'; -$string['invalidmd5'] = 'md5 inválido'; +$string['invalidmd5'] = 'A variável de verificação está errada - tente novamente.'; $string['missingrequiredfield'] = 'Um dos campos obrigatórios está em falta'; $string['remotedownloaderror'] = 'A descarga do componente para o servidor falhou. Verifique as configurações do proxy. A instalação da extensão cURL do PHP é muito recomendada.

Terá que descarregar o ficheiro {$a->url} manualmente, copiá-lo para a pasta "{$a->dest}" no seu servidor e descompactá-lo.'; $string['wrongdestpath'] = 'Caminho de destino errado.'; -- 1.7.9.5 From 7be6c09db583976c5402b8f21fe88774ebe72103 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 16:57:05 +0800 Subject: [PATCH 673/903] MDL-34607 File API: Removed ordering by sortorder in area tree --- lib/filestorage/file_storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 917705b..c34ebe6 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -443,7 +443,7 @@ class file_storage { */ public function get_area_tree($contextid, $component, $filearea, $itemid) { $result = array('dirname'=>'', 'dirfile'=>null, 'subdirs'=>array(), 'files'=>array()); - $files = $this->get_area_files($contextid, $component, $filearea, $itemid, "sortorder, itemid, filepath, filename", true); + $files = $this->get_area_files($contextid, $component, $filearea, $itemid, "itemid, filepath, filename", true); // first create directory structure foreach ($files as $hash=>$dir) { if (!$dir->is_directory()) { -- 1.7.9.5 From 7ae2136b3fc1bd575cac7dd7a5b3dc69e216488c Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 17:02:30 +0800 Subject: [PATCH 674/903] MDL-34607 Folder: Remove any sort order during upgrade --- lib/db/upgrade.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 97f3fb2..386792c 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -959,5 +959,15 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2012062501.14); } + if ($oldversion < 2012062502.02) { + // Some folders still have a sortorder set, which is used for main files but is not + // supported by the folder resource. We reset the value here. + $sql = 'UPDATE {files} SET sortorder = ? WHERE component = ? AND filearea = ? AND sortorder <> ?'; + $DB->execute($sql, array(0, 'mod_folder', 'content', 0)); + + // Main savepoint reached. + upgrade_main_savepoint(true, 2012062502.02); + } + return true; } -- 1.7.9.5 From aa578540751385bde731f726c38744228e94026a Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 11:54:37 +0800 Subject: [PATCH 675/903] MDL-35242 Web Services: Removed translation causing error in add_to_log --- login/token.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login/token.php b/login/token.php index adfe1d4..9194de2 100644 --- a/login/token.php +++ b/login/token.php @@ -160,7 +160,7 @@ if (!empty($user)) { $token->timecreated = time(); $token->externalserviceid = $service_record->id; $tokenid = $DB->insert_record('external_tokens', $token); - add_to_log(SITEID, 'webservice', get_string('createtokenforuserauto', 'webservice'), '' , 'User ID: ' . $user->id); + add_to_log(SITEID, 'webservice', 'automatically create user token', '' , 'User ID: ' . $user->id); $token->id = $tokenid; } else { throw new moodle_exception('cannotcreatetoken', 'webservice', '', $serviceshortname); -- 1.7.9.5 From 6b15d50a60fd49cc68d98dffd632f00a9d0206c3 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 11:38:43 +0800 Subject: [PATCH 676/903] MDL-35312 Web Services: Fixed typo in capability of course update --- lib/db/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/db/services.php b/lib/db/services.php index 4df607a..dbbc38b 100644 --- a/lib/db/services.php +++ b/lib/db/services.php @@ -522,7 +522,7 @@ $functions = array( 'classpath' => 'course/externallib.php', 'description' => 'Update categories', 'type' => 'write', - 'capabilities'=> 'moodle:category/manage', + 'capabilities'=> 'moodle/category:manage', ), 'core_course_delete_categories' => array( -- 1.7.9.5 From 05daea0f6d8f3b8673755762c96554837d7e70a2 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 11 Sep 2012 14:53:15 +0800 Subject: [PATCH 677/903] MDL-31976 Accessbility: Action icons on course page do not need title attributes --- course/format/renderer.php | 3 ++- course/lib.php | 33 +++++++++++++++------------------ course/yui/toolboxes/toolboxes.js | 6 ------ lib/outputcomponents.php | 4 ++++ lib/yui/dragdrop/dragdrop.js | 3 +-- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/course/format/renderer.php b/course/format/renderer.php index c758cac..26f7824 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -168,7 +168,8 @@ abstract class format_section_renderer_base extends plugin_renderer_base { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $context)) { $url = new moodle_url('/course/editsection.php', array('id'=>$section->id, 'sr'=>$sectionreturn)); $o.= html_writer::link($url, - html_writer::empty_tag('img', array('src' => $this->output->pix_url('t/edit'), 'class' => 'iconsmall edit')), + html_writer::empty_tag('img', array('src' => $this->output->pix_url('t/edit'), + 'class' => 'iconsmall edit', 'alt' => get_string('editsummary'))), array('title' => get_string('editsummary'))); } $o.= html_writer::end_tag('div'); diff --git a/course/lib.php b/course/lib.php index ac7a957..c3fa3cb 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1572,8 +1572,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // Display link itself echo 'extra . $onclick . ' href="' . $url . '">' . - $modulename . ' ' . + '" class="activityicon" alt="" /> ' . $accesstext . '' . $instancename . $altname . ''; @@ -1608,9 +1607,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // Display greyed-out text of link echo '
extra . ' >' . '' . - $modulename . - ' '. $instancename . $altname . + '" class="activityicon" alt="" /> '. $instancename . $altname . '
'; // Do not display content after link when it is greyed out like this. @@ -3204,7 +3201,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($mod->modname !== 'label' && $hasmanageactivities && course_ajax_enabled($COURSE)) { $actions[] = new action_link( new moodle_url($baseurl, array('update' => $mod->id)), - new pix_icon('t/editstring', $str->edittitle, 'moodle', array('class' => 'iconsmall visibleifjs')), + new pix_icon('t/editstring', $str->edittitle, 'moodle', array('class' => 'iconsmall visibleifjs', 'title' => '')), null, array('class' => 'editing_title', 'title' => $str->edittitle) ); @@ -3223,7 +3220,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($indent > 0) { $actions[] = new action_link( new moodle_url($baseurl, array('id' => $mod->id, 'indent' => '-1')), - new pix_icon($leftarrow, $str->moveleft, 'moodle', array('class' => 'iconsmall')), + new pix_icon($leftarrow, $str->moveleft, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_moveleft', 'title' => $str->moveleft) ); @@ -3231,7 +3228,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($indent >= 0) { $actions[] = new action_link( new moodle_url($baseurl, array('id' => $mod->id, 'indent' => '1')), - new pix_icon($rightarrow, $str->moveright, 'moodle', array('class' => 'iconsmall')), + new pix_icon($rightarrow, $str->moveright, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_moveright', 'title' => $str->moveright) ); @@ -3243,20 +3240,20 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($moveselect) { $actions[] = new action_link( new moodle_url($baseurl, array('copy' => $mod->id)), - new pix_icon('t/move', $str->move, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/move', $str->move, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_move', 'title' => $str->move) ); } else { $actions[] = new action_link( new moodle_url($baseurl, array('id' => $mod->id, 'move' => '-1')), - new pix_icon('t/up', $str->moveup, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/up', $str->moveup, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_moveup', 'title' => $str->moveup) ); $actions[] = new action_link( new moodle_url($baseurl, array('id' => $mod->id, 'move' => '1')), - new pix_icon('t/down', $str->movedown, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/down', $str->movedown, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_movedown', 'title' => $str->movedown) ); @@ -3267,7 +3264,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($hasmanageactivities) { $actions[] = new action_link( new moodle_url($baseurl, array('update' => $mod->id)), - new pix_icon('t/edit', $str->update, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/edit', $str->update, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_update', 'title' => $str->update) ); @@ -3277,7 +3274,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if (has_all_capabilities($dupecaps, $coursecontext) && plugin_supports('mod', $mod->modname, FEATURE_BACKUP_MOODLE2)) { $actions[] = new action_link( new moodle_url($baseurl, array('duplicate' => $mod->id)), - new pix_icon('t/copy', $str->duplicate, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/copy', $str->duplicate, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_duplicate', 'title' => $str->duplicate) ); @@ -3287,7 +3284,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($hasmanageactivities) { $actions[] = new action_link( new moodle_url($baseurl, array('delete' => $mod->id)), - new pix_icon('t/delete', $str->delete, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/delete', $str->delete, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_delete', 'title' => $str->delete) ); @@ -3298,14 +3295,14 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($mod->visible) { $actions[] = new action_link( new moodle_url($baseurl, array('hide' => $mod->id)), - new pix_icon('t/hide', $str->hide, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/hide', $str->hide, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_hide', 'title' => $str->hide) ); } else { $actions[] = new action_link( new moodle_url($baseurl, array('show' => $mod->id)), - new pix_icon('t/show', $str->show, 'moodle', array('class' => 'iconsmall')), + new pix_icon('t/show', $str->show, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_show', 'title' => $str->show) ); @@ -3336,7 +3333,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if ($mod->groupmodelink) { $actions[] = new action_link( new moodle_url($baseurl, array('id' => $mod->id, 'groupmode' => $groupmode)), - new pix_icon($groupimage, $grouptitle, 'moodle', array('class' => 'iconsmall')), + new pix_icon($groupimage, $grouptitle, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => $groupclass, 'title' => $grouptitle) ); @@ -3349,7 +3346,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele if (has_capability('moodle/role:assign', $modcontext)){ $actions[] = new action_link( new moodle_url('/'.$CFG->admin.'/roles/assign.php', array('contextid' => $modcontext->id)), - new pix_icon('i/roles', $str->assign, 'moodle', array('class' => 'iconsmall')), + new pix_icon('i/roles', $str->assign, 'moodle', array('class' => 'iconsmall', 'title' => '')), null, array('class' => 'editing_assign', 'title' => $str->assign) ); diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index 024785e..2b92347 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -106,7 +106,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { var newstring = M.util.get_string(status, 'moodle'); hideicon.setAttrs({ 'alt' : newstring, - 'title' : newstring, 'src' : M.util.image_url('t/' + status) }); button.set('title', newstring); @@ -446,7 +445,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { // Change the UI icon.setAttrs({ 'alt' : newtitle, - 'title' : newtitle, 'src' : iconsrc }); button.setAttribute('title', newtitle); @@ -473,7 +471,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { .addClass(CSS.GENERICICONCLASS) .setAttrs({ 'src' : M.util.image_url('t/left', 'moodle'), - 'title' : left_string, 'alt' : left_string }); var moveright = target.one(CSS.MOVERIGHT); @@ -682,7 +679,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { var newstring = M.util.get_string(status + 'fromothers', 'format_' + this.get('format')); hideicon.setAttrs({ 'alt' : newstring, - 'title' : newstring, 'src' : M.util.image_url('i/' + status) }); button.set('title', newstring); @@ -740,7 +736,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { .set('title', old_string); Y.one(CSS.PAGECONTENT) .all(M.course.format.get_section_selector(Y) + '.current ' + CSS.HIGHLIGHT + ' img') - .set('title', old_string) .set('alt', old_string) .set('src', M.util.image_url('i/marker')); @@ -756,7 +751,6 @@ YUI.add('moodle-course-toolboxes', function(Y) { button .set('title', new_string); buttonicon - .set('title', new_string) .set('alt', new_string) .set('src', M.util.image_url('i/marked')); } diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index 6b760c2..a20bd7c 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -550,6 +550,10 @@ class pix_icon implements renderable { } if (!isset($this->attributes['title'])) { $this->attributes['title'] = $this->attributes['alt']; + } else if (empty($this->attributes['title'])) { + // Remove the title attribute if empty, we probably want to use the parent node's title + // and some browsers might overwrite it with an empty title. + unset($this->attributes['title']); } } } diff --git a/lib/yui/dragdrop/dragdrop.js b/lib/yui/dragdrop/dragdrop.js index 6669f37..17b368c 100644 --- a/lib/yui/dragdrop/dragdrop.js +++ b/lib/yui/dragdrop/dragdrop.js @@ -36,8 +36,7 @@ YUI.add('moodle-core-dragdrop', function(Y) { .setStyle('cursor', 'move') .setAttrs({ 'src' : M.util.image_url(MOVEICON.pix, MOVEICON.component), - 'alt' : title, - 'title' : M.str.moodle.move + 'alt' : title }); if (iconclass) { dragicon.addClass(iconclass); -- 1.7.9.5 From 7cdb7250812cad36ffc384d94375cec8b836ef01 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Thu, 6 Sep 2012 15:13:38 +0800 Subject: [PATCH 678/903] MDL-30889 calendar: Adding focus and blur events to calendar renderer --- calendar/yui/eventmanager/eventmanager.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/calendar/yui/eventmanager/eventmanager.js b/calendar/yui/eventmanager/eventmanager.js index 578ba81..7230dd2 100644 --- a/calendar/yui/eventmanager/eventmanager.js +++ b/calendar/yui/eventmanager/eventmanager.js @@ -24,6 +24,8 @@ YUI.add('moodle-calendar-eventmanager', function(Y) { this.publish('hideevent'); td.on('mouseenter', this.startShow, this); td.on('mouseleave', this.startHide, this); + td.on('focus', this.startShow, this); + td.on('blur', this.startHide, this); return true; }, initPanel : function() { -- 1.7.9.5 From 94167a2dee8bcaaa764c7289603684c534cd06be Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Fri, 21 Sep 2012 13:25:20 +0800 Subject: [PATCH 679/903] MDL-34476 - Course Completeion, Blocks - Allowing teachers to access the Full Course Report from the Course Completion Block -- Initial patch provided by Nadav Kavalerchik --- blocks/completionstatus/block_completionstatus.php | 223 ++++++++++---------- 1 file changed, 110 insertions(+), 113 deletions(-) diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 449e632..2e00684 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -83,148 +83,145 @@ class block_completionstatus extends block_base { } // Check this user is enroled - if (!$info->is_tracked_user($USER->id)) { - // If not enrolled, but are can view the report: - if (has_capability('report/completion:view', get_context_instance(CONTEXT_COURSE, $course->id))) { - $report = new moodle_url('/report/completion/index.php', array('course' => $course->id)); - $this->content->text = ''.get_string('viewcoursereport', 'completion').''; - return $this->content; - } + if ($info->is_tracked_user($USER->id)) { - // Otherwise, show error - $this->content->text = get_string('notenroled', 'completion'); - return $this->content; - } + // Generate markup for criteria statuses + $shtml = ''; - // Generate markup for criteria statuses - $shtml = ''; + // For aggregating activity completion + $activities = array(); + $activities_complete = 0; - // For aggregating activity completion - $activities = array(); - $activities_complete = 0; + // For aggregating course prerequisites + $prerequisites = array(); + $prerequisites_complete = 0; - // For aggregating course prerequisites - $prerequisites = array(); - $prerequisites_complete = 0; + // Flag to set if current completion data is inconsistent with + // what is stored in the database + $pending_update = false; - // Flag to set if current completion data is inconsistent with - // what is stored in the database - $pending_update = false; + // Loop through course criteria + foreach ($completions as $completion) { - // Loop through course criteria - foreach ($completions as $completion) { + $criteria = $completion->get_criteria(); + $complete = $completion->is_complete(); - $criteria = $completion->get_criteria(); - $complete = $completion->is_complete(); + if (!$pending_update && $criteria->is_pending($completion)) { + $pending_update = true; + } - if (!$pending_update && $criteria->is_pending($completion)) { - $pending_update = true; - } + // Activities are a special case, so cache them and leave them till last + if ($criteria->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) { + $activities[$criteria->moduleinstance] = $complete; - // Activities are a special case, so cache them and leave them till last - if ($criteria->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) { - $activities[$criteria->moduleinstance] = $complete; + if ($complete) { + $activities_complete++; + } - if ($complete) { - $activities_complete++; + continue; } - continue; - } + // Prerequisites are also a special case, so cache them and leave them till last + if ($criteria->criteriatype == COMPLETION_CRITERIA_TYPE_COURSE) { + $prerequisites[$criteria->courseinstance] = $complete; - // Prerequisites are also a special case, so cache them and leave them till last - if ($criteria->criteriatype == COMPLETION_CRITERIA_TYPE_COURSE) { - $prerequisites[$criteria->courseinstance] = $complete; + if ($complete) { + $prerequisites_complete++; + } - if ($complete) { - $prerequisites_complete++; + continue; } - continue; + $shtml .= '
'; } - $shtml .= ''; - } + // Aggregate activities + if (!empty($activities)) { + + $shtml .= ''; + } - // Aggregate activities - if (!empty($activities)) { - - $shtml .= ''; - } + // Aggregate prerequisites + if (!empty($prerequisites)) { - // Aggregate prerequisites - if (!empty($prerequisites)) { + $phtml = ''; - $phtml = ''; + $shtml = $phtml . $shtml; + } - $shtml = $phtml . $shtml; - } + // Display completion status + $this->content->text = '
'; + $shtml .= $criteria->get_title(); + $shtml .= ''; + $shtml .= $completion->get_status(); + $shtml .= '
'; - $shtml .= $criteria->get_title(); - $shtml .= ''; - $shtml .= $completion->get_status(); - $shtml .= '
'; + $shtml .= get_string('activitiescompleted', 'completion'); + $shtml .= ''; + $a = new stdClass(); + $a->first = $activities_complete; + $a->second = count($activities); + $shtml .= get_string('firstofsecond', 'block_completionstatus', $a); + $shtml .= '
'; - $shtml .= get_string('activitiescompleted', 'completion'); - $shtml .= ''; - $a = new stdClass(); - $a->first = $activities_complete; - $a->second = count($activities); - $shtml .= get_string('firstofsecond', 'block_completionstatus', $a); - $shtml .= '
'; + $phtml .= get_string('prerequisitescompleted', 'completion'); + $phtml .= ''; + $a = new stdClass(); + $a->first = $prerequisites_complete; + $a->second = count($prerequisites); + $phtml .= get_string('firstofsecond', 'block_completionstatus', $a); + $phtml .= '
'; - $phtml .= get_string('prerequisitescompleted', 'completion'); - $phtml .= ''; - $a = new stdClass(); - $a->first = $prerequisites_complete; - $a->second = count($prerequisites); - $phtml .= get_string('firstofsecond', 'block_completionstatus', $a); - $phtml .= '
'; + $this->content->text .= ''; - $this->content->text .= ''; - $this->content->text .= $shtml.'
'.get_string('status').': '; + + // Is course complete? + $coursecomplete = $info->is_course_complete($USER->id); + + // Load course completion + $params = array( + 'userid' => $USER->id, + 'course' => $course->id + ); + $ccompletion = new completion_completion($params); + + // Has this user completed any criteria? + $criteriacomplete = $info->count_course_user_data($USER->id); + + if ($pending_update) { + $this->content->text .= ''.get_string('pending', 'completion').''; + } else if ($coursecomplete) { + $this->content->text .= get_string('complete'); + } else if (!$criteriacomplete && !$ccompletion->timestarted) { + $this->content->text .= ''.get_string('notyetstarted', 'completion').''; + } else { + $this->content->text .= ''.get_string('inprogress','completion').''; + } - // Display completion status - $this->content->text = ''; - $this->content->text .= ''; + $this->content->text .= ''; - $this->content->text .= ''; + $this->content->text .= ''; + $this->content->text .= $shtml.'
'.get_string('status').': '; - - // Is course complete? - $coursecomplete = $info->is_course_complete($USER->id); - - // Load course completion - $params = array( - 'userid' => $USER->id, - 'course' => $course->id - ); - $ccompletion = new completion_completion($params); - - // Has this user completed any criteria? - $criteriacomplete = $info->count_course_user_data($USER->id); - - if ($pending_update) { - $this->content->text .= ''.get_string('pending', 'completion').''; - } else if ($coursecomplete) { - $this->content->text .= get_string('complete'); - } else if (!$criteriacomplete && !$ccompletion->timestarted) { - $this->content->text .= ''.get_string('notyetstarted', 'completion').''; - } else { - $this->content->text .= ''.get_string('inprogress','completion').''; - } + $this->content->text .= '
'; + + // Get overall aggregation method + $overall = $info->get_aggregation_method(); - $this->content->text .= '
'; + if ($overall == COMPLETION_AGGREGATION_ALL) { + $this->content->text .= get_string('criteriarequiredall', 'completion'); + } else { + $this->content->text .= get_string('criteriarequiredany', 'completion'); + } - // Get overall aggregation method - $overall = $info->get_aggregation_method(); + $this->content->text .= ':
'.get_string('requiredcriteria', 'completion').''.get_string('status').'
'; - if ($overall == COMPLETION_AGGREGATION_ALL) { - $this->content->text .= get_string('criteriarequiredall', 'completion'); + // Display link to detailed view + $details = new moodle_url('/blocks/completionstatus/details.php', array('course' => $course->id)); + $this->content->footer = '
'.get_string('moredetails', 'completion').''; } else { - $this->content->text .= get_string('criteriarequiredany', 'completion'); + // If user is not enrolled, show error + $this->content->text = get_string('notenroled', 'completion'); } - $this->content->text .= ':
'.get_string('requiredcriteria', 'completion').''.get_string('status').'
'; - - // Display link to detailed view - $details = new moodle_url('/blocks/completionstatus/details.php', array('course' => $course->id)); - $this->content->footer = '
'.get_string('moredetails', 'completion').''; - + if (has_capability('report/completion:view', $context)) { + $report = new moodle_url('/report/completion/index.php', array('course' => $course->id)); + $this->content->footer .= '
'.get_string('viewcoursereport', 'completion').''; + } return $this->content; } } -- 1.7.9.5 From 99cd723af5117e4388b5519da1aca1ad17327ba4 Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Fri, 24 Aug 2012 15:23:03 +1200 Subject: [PATCH 680/903] MDL-34328: course dragdrop - performance rewrite Use YUI's DragDrop delegates for course dragdrop, rather than initialising a Drag object for each individual section and each individual activity/resource. Also, clone a single drag handle for activities/resources, rather than repeatedly creating a whole new one with the same parameters for each activity/resource. --- course/yui/dragdrop/dragdrop.js | 87 ++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 38 deletions(-) diff --git a/course/yui/dragdrop/dragdrop.js b/course/yui/dragdrop/dragdrop.js index 435b355..f52497e 100644 --- a/course/yui/dragdrop/dragdrop.js +++ b/course/yui/dragdrop/dragdrop.js @@ -41,6 +41,26 @@ YUI.add('moodle-course-dragdrop', function(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 nodeselector = this.sectionlistselector.slice(CSS.COURSECONTENT.length+2); + var del = new Y.DD.Delegate({ + container: '.'+CSS.COURSECONTENT, + nodes: nodeselector, + 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); } }, @@ -76,22 +96,6 @@ YUI.add('moodle-course-dragdrop', function(Y) { if (movedown) { movedown.remove(); } - - // Make each li element in the lists of sections draggable - var dd = new Y.DD.Drag({ - node: sectionnode, - // Make each li a Drop target too - groups: this.groups, - target: true, - handles: ['.'+CSS.LEFT] - }).plug(Y.Plugin.DDProxy, { - // Don't move the node at the end of the drag - moveOnEnd: false - }).plug(Y.Plugin.DDConstrained, { - // Keep it inside the .course-content - constrain: '#'+CSS.PAGECONTENT, - stickY: true - }).plug(Y.Plugin.DDWinScroll); } } }, this); @@ -244,12 +248,33 @@ YUI.add('moodle-course-dragdrop', function(Y) { 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); // 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 + }); + 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; } @@ -269,15 +294,15 @@ YUI.add('moodle-course-dragdrop', function(Y) { var resources = Y.Node.create('
    '); resources.addClass(CSS.SECTION); sectionnode.one('.'+CSS.CONTENT+' div.'+CSS.SUMMARY).insert(resources, 'after'); + // 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' + }); } - // Define each 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' - }); - // Go through each li element and make them draggable + // Initialise each resource/activity in this section this.setup_for_resource('#'+sectionnode.get('id')+' li.'+CSS.ACTIVITY); }, this); }, @@ -292,21 +317,7 @@ YUI.add('moodle-course-dragdrop', function(Y) { // Replace move icons var move = resourcesnode.one('a.'+CSS.EDITINGMOVE); if (move) { - move.replace(this.get_drag_handle(M.str.moodle.move, CSS.EDITINGMOVE, CSS.ICONCLASS)); - // Make each li element in the lists of sections draggable - var dd = new Y.DD.Drag({ - node: resourcesnode, - groups: this.groups, - // Make each li a Drop target too - target: true, - handles: ['.' + CSS.EDITINGMOVE] - }).plug(Y.Plugin.DDProxy, { - // Don't move the node at the end of the drag - moveOnEnd: false - }).plug(Y.Plugin.DDConstrained, { - // Keep it inside the .course-content - constrain: '#'+CSS.PAGECONTENT - }).plug(Y.Plugin.DDWinScroll); + move.replace(this.resourcedraghandle.cloneNode(true)); } }, this); }, -- 1.7.9.5 From e4db46b4d9130dc4f8c757b4e2e489ae507e35c8 Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Fri, 24 Aug 2012 15:50:08 +1200 Subject: [PATCH 681/903] MDL-34328: course resource "toolboxes" - performance rewrite Use YUI event delegation to handle events in course resource "toolboxes" (sets of editing icons) rather than attaching event handlers to each individual button we care about. Don't waste time setting the CSS cursor to what it already is, use .all() rather than replace_button() if we just need the node. Section toolboxes could probably also be done this way to some extent, but the payoff may not be worth the effort - they're so minimal that they don't tend to cause issues. --- course/yui/toolboxes/toolboxes.js | 42 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index 024785e..321ce8c 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -241,6 +241,17 @@ YUI.add('moodle-course-toolboxes', function(Y) { initializer : function(config) { this.setup_for_resource(); M.course.coursebase.register_module(this); + + var prefix = CSS.ACTIVITYLI + ' ' + CSS.COMMANDSPAN + ' '; + Y.delegate('click', this.edit_resource_title, CSS.PAGECONTENT, prefix + CSS.EDITTITLE, this); + Y.delegate('click', this.move_left, CSS.PAGECONTENT, prefix + CSS.MOVELEFT, this); + Y.delegate('click', this.move_right, CSS.PAGECONTENT, prefix + CSS.MOVERIGHT, this); + Y.delegate('click', this.delete_resource, CSS.PAGECONTENT, prefix + CSS.DELETE, this); + Y.delegate('click', this.toggle_hide_resource, CSS.PAGECONTENT, prefix + CSS.HIDE, this); + Y.delegate('click', this.toggle_hide_resource, CSS.PAGECONTENT, prefix + CSS.SHOW, this); + Y.delegate('click', this.toggle_groupmode, CSS.PAGECONTENT, prefix + CSS.GROUPSNONE, this); + Y.delegate('click', this.toggle_groupmode, CSS.PAGECONTENT, prefix + CSS.GROUPSSEPARATE, this); + Y.delegate('click', this.toggle_groupmode, CSS.PAGECONTENT, prefix + CSS.GROUPSVISIBLE, this); }, /** @@ -252,27 +263,16 @@ YUI.add('moodle-course-toolboxes', function(Y) { */ setup_for_resource : function(baseselector) { if (!baseselector) { - var baseselector = CSS.PAGECONTENT + ' ' + CSS.ACTIVITYLI;; + var baseselector = CSS.PAGECONTENT + ' ' + CSS.ACTIVITYLI; } Y.all(baseselector).each(this._setup_for_resource, this); }, _setup_for_resource : function(toolboxtarget) { - // Edit Title - this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.EDITTITLE, this.edit_resource_title); - - // Move left and right - this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.MOVELEFT, this.move_left); - this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.MOVERIGHT, this.move_right); - - // Delete - this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.DELETE, this.delete_resource); - - // Show/Hide - var showhide = this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.HIDE, this.toggle_hide_resource); - var shown = this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.SHOW, this.toggle_hide_resource); - - showhide = showhide.concat(shown); + toolboxtarget = Y.one(toolboxtarget); + // "Disable" show/hide icons (change cursor to not look clickable) if section is hidden + var showhide = toolboxtarget.all(CSS.COMMANDSPAN + ' ' + CSS.HIDE); + showhide.concat(toolboxtarget.all(CSS.COMMANDSPAN + ' ' + CSS.SHOW)); showhide.each(function(node) { var section = node.ancestor(CSS.SECTIONLI); if (section && section.hasClass(CSS.SECTIONHIDDENCLASS)) { @@ -280,15 +280,15 @@ YUI.add('moodle-course-toolboxes', function(Y) { } }); - // Change Group Mode + // Set groupmode attribute for use by this.toggle_groupmode() var groups; - groups = this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.GROUPSNONE, this.toggle_groupmode); + groups = toolboxtarget.all(CSS.COMMANDSPAN + ' ' + CSS.GROUPSNONE); groups.setAttribute('groupmode', this.GROUPS_NONE); - groups = this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.GROUPSSEPARATE, this.toggle_groupmode); + groups = toolboxtarget.all(CSS.COMMANDSPAN + ' ' + CSS.GROUPSSEPARATE); groups.setAttribute('groupmode', this.GROUPS_SEPARATE); - groups = this.replace_button(toolboxtarget, CSS.COMMANDSPAN + ' ' + CSS.GROUPSVISIBLE, this.toggle_groupmode); + groups = toolboxtarget.all(CSS.COMMANDSPAN + ' ' + CSS.GROUPSVISIBLE); groups.setAttribute('groupmode', this.GROUPS_VISIBLE); }, move_left : function(e) { @@ -405,6 +405,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { }; var spinner = M.util.add_spinner(Y, element.one(CSS.SPINNERCOMMANDSPAN)); this.send_request(data, spinner); + return false; // Need to return false to stop the delegate for the new state firing }, toggle_groupmode : function(e) { // Prevent the default button action @@ -460,6 +461,7 @@ YUI.add('moodle-course-toolboxes', function(Y) { }; var spinner = M.util.add_spinner(Y, element.one(CSS.SPINNERCOMMANDSPAN)); this.send_request(data, spinner); + return false; // Need to return false to stop the delegate for the new state firing }, /** * Add the moveleft button -- 1.7.9.5 From a573a5157e5fbf399c1c970ab1bc6fb27cecaa21 Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Wed, 5 Sep 2012 11:59:11 +1200 Subject: [PATCH 682/903] MDL-34328: course section "toolboxes" - performance rewrite Use YUI event delegation to handle events in course section "toolboxes" (visibility and highlight toggles) rather than attaching event handlers to each individual button we care about. Also remove the (now unused) replace_button() function. --- course/yui/toolboxes/toolboxes.js | 43 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index 321ce8c..6954890 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -49,32 +49,9 @@ YUI.add('moodle-course-toolboxes', function(Y) { Y.extend(TOOLBOX, Y.Base, { /** - * Replace the button click at the selector with the specified - * callback - * - * @param toolboxtarget The selector of the working area - * @param selector The 'button' to replace - * @param callback The callback to apply - * @param cursor An optional cursor style to apply + * Toggle the visibility and availability for the specified + * resource show/hide button */ - replace_button : function(toolboxtarget, selector, callback, cursor) { - if (!cursor) { - // Set the default cursor type to pointer to match the - // anchor - cursor = 'pointer'; - } - var button = Y.one(toolboxtarget).all(selector) - .setStyle('cursor', cursor); - - // on isn't chainable and will return an event - button.on('click', callback, this); - - return button; - }, - /** - * Toggle the visibility and availability for the specified - * resource show/hide button - */ toggle_hide_resource_ui : function(button) { var element = button.ancestor(CSS.ACTIVITYLI); var hideicon = button.one('img'); @@ -634,6 +611,11 @@ YUI.add('moodle-course-toolboxes', function(Y) { initializer : function(config) { this.setup_for_section(); M.course.coursebase.register_module(this); + + // Section Highlighting + Y.delegate('click', this.toggle_highlight, CSS.PAGECONTENT, CSS.SECTIONLI + ' ' + CSS.HIGHLIGHT, this); + // Section Visibility + Y.delegate('click', this.toggle_hide_section, CSS.PAGECONTENT, CSS.SECTIONLI + ' ' + CSS.SHOWHIDE, this); }, /** * Update any section areas within the scope of the specified @@ -643,18 +625,15 @@ YUI.add('moodle-course-toolboxes', function(Y) { * @return void */ setup_for_section : function(baseselector) { - if (!baseselector) { + // Left here for potential future use - not currently needed due to YUI delegation in initializer() + /*if (!baseselector) { var baseselector = CSS.PAGECONTENT; } - Y.all(baseselector).each(this._setup_for_section, this); + Y.all(baseselector).each(this._setup_for_section, this);*/ }, _setup_for_section : function(toolboxtarget) { - // Section Highlighting - this.replace_button(toolboxtarget, CSS.RIGHTSIDE + ' ' + CSS.HIGHLIGHT, this.toggle_highlight); - - // Section Visibility - this.replace_button(toolboxtarget, CSS.RIGHTSIDE + ' ' + CSS.SHOWHIDE, this.toggle_hide_section); + // Left here for potential future use - not currently needed due to YUI delegation in initializer() }, toggle_hide_section : function(e) { // Prevent the default button action -- 1.7.9.5 From 65c8ccc02ed4124ce07eefe6d5a1b985e0fad7c3 Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Wed, 5 Sep 2012 14:14:39 +1200 Subject: [PATCH 683/903] MDL-34328: block dragdrop - performance rewrite Use YUI's DragDrop delegates for block dragdrop - one per block region - rather than initialising a Drag object for each individual block. --- lib/yui/blocks/blocks.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/yui/blocks/blocks.js b/lib/yui/blocks/blocks.js index cec719f..b0835f6 100644 --- a/lib/yui/blocks/blocks.js +++ b/lib/yui/blocks/blocks.js @@ -68,23 +68,26 @@ YUI.add('moodle-core-blocks', function(Y) { padding: '40 240 40 240' }); + // Make each div element in the list of blocks draggable + var del = new Y.DD.Delegate({ + container: blockregionnode, + nodes: '.'+CSS.BLOCK, + target: true, + handles: ['.'+CSS.HEADER], + 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.DDWinScroll); + var blocklist = blockregionnode.all('.'+CSS.BLOCK); blocklist.each(function(blocknode) { var move = blocknode.one('a.'+CSS.EDITINGMOVE); if (move) { move.remove(); blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move'); - // Make each div element in the list of blocks draggable - var dd = new Y.DD.Drag({ - node: blocknode, - groups: this.groups, - // Make each div a Drop target too - target: true, - handles: ['.'+CSS.HEADER] - }).plug(Y.Plugin.DDProxy, { - // Don't move the node at the end of the drag - moveOnEnd: false - }).plug(Y.Plugin.DDWinScroll); } }, this); }, this); -- 1.7.9.5 From 3f6970bf9205f6b058ad9daa9ffae9a2ba70d654 Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Wed, 5 Sep 2012 14:50:40 +1200 Subject: [PATCH 684/903] MDL-34328: block dragdrop - disallow dragging from show/hide and dock icons Tell the YUI drag/drop delegate that the show/hide and dock icons are not valid drag handles. Otherwise, a drag can be initiated by showing or hiding a block (probably not from docking one, but better safe than sorry). Not strictly related to MDL-34328, but likely to be encountered whilst testing - and closely related to another patch for MDL-34328. Note that the "invalid" config option for the delegate takes a string - not an array - but can have multiple selectors separated by commas. --- lib/yui/blocks/blocks.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/yui/blocks/blocks.js b/lib/yui/blocks/blocks.js index b0835f6..2147502 100644 --- a/lib/yui/blocks/blocks.js +++ b/lib/yui/blocks/blocks.js @@ -74,6 +74,7 @@ YUI.add('moodle-core-blocks', function(Y) { nodes: '.'+CSS.BLOCK, target: true, handles: ['.'+CSS.HEADER], + invalid: '.block-hider-hide, .block-hider-show, .moveto', dragConfig: {groups: this.groups} }); del.dd.plug(Y.Plugin.DDProxy, { -- 1.7.9.5 From cffbc80ac70501098b0fe82efe182e506f77630d Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Tue, 18 Sep 2012 11:17:28 +0100 Subject: [PATCH 685/903] MDL-34328 Correct usage of e.drop when catching missed drag/drop events --- lib/yui/dragdrop/dragdrop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/yui/dragdrop/dragdrop.js b/lib/yui/dragdrop/dragdrop.js index 6669f37..4abbe55 100644 --- a/lib/yui/dragdrop/dragdrop.js +++ b/lib/yui/dragdrop/dragdrop.js @@ -167,11 +167,11 @@ YUI.add('moodle-core-dragdrop', function(Y) { // we substitute them for the ease of use. For e.drop we use, // this.lastdroptarget (ghost node we use for indicating where to drop) e.drag = e.target; + e.drop = this.lastdroptarget; // Check that drop object belong to correct group if (!e.drop || !e.drop.inGroup(this.groups)) { return; } - e.drop = this.lastdroptarget; this.drag_dropmiss(e); }, -- 1.7.9.5 From e36ab386423d7b19326391808ceea948154ebeb7 Mon Sep 17 00:00:00 2001 From: Rex Lorenzo Date: Sun, 23 Sep 2012 01:14:14 -0700 Subject: [PATCH 686/903] MDL-35587 - Display grouping name for Drag and Dropped resources --- course/dndupload.js | 18 ++++++++++++++++++ course/dnduploadlib.php | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/course/dndupload.js b/course/dndupload.js index 7bfef1d..e410d40 100644 --- a/course/dndupload.js +++ b/course/dndupload.js @@ -445,6 +445,7 @@ M.course_dndupload = { a: document.createElement('a'), icon: document.createElement('img'), namespan: document.createElement('span'), + groupingspan: document.createElement('span'), progressouter: document.createElement('span'), progress: document.createElement('span') }; @@ -469,6 +470,9 @@ M.course_dndupload = { resel.div.appendChild(document.createTextNode(' ')); + resel.groupingspan.className = 'groupinglabel'; + resel.div.appendChild(resel.groupingspan); + resel.progressouter.className = 'dndupload-progress-outer'; resel.progress.className = 'dndupload-progress-inner'; resel.progress.innerHTML = ' '; @@ -724,6 +728,13 @@ M.course_dndupload = { resel.icon.src = result.icon; resel.a.href = result.link; resel.namespan.innerHTML = result.name; + + if (result.groupingname) { + resel.groupingspan.innerHTML = '(' + result.groupingname + ')'; + } else { + resel.div.removeChild(resel.groupingspan); + } + resel.div.removeChild(resel.progressouter); resel.li.id = result.elementid; resel.div.innerHTML += result.commands; @@ -904,6 +915,13 @@ M.course_dndupload = { resel.icon.src = result.icon; resel.a.href = result.link; resel.namespan.innerHTML = result.name; + + if (result.groupingname) { + resel.groupingspan.innerHTML = '(' + result.groupingname + ')'; + } else { + resel.div.removeChild(resel.groupingspan); + } + resel.div.removeChild(resel.progressouter); resel.li.id = result.elementid; resel.div.innerHTML += result.commands; diff --git a/course/dnduploadlib.php b/course/dnduploadlib.php index 816924b..043b6c7 100644 --- a/course/dnduploadlib.php +++ b/course/dnduploadlib.php @@ -667,6 +667,12 @@ class dndupload_ajax_processor { $resp->commands = make_editing_buttons($mod, true, true, 0, $mod->sectionnum); $resp->onclick = $mod->get_on_click(); + // 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); + } + echo $OUTPUT->header(); echo json_encode($resp); die(); -- 1.7.9.5 From 2b7024847d8aa1faaeea2746b7157106fb06df63 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 18 Sep 2012 11:17:18 +0800 Subject: [PATCH 687/903] MDL-35427: Remove resetting of $_POST - use $mform->setConstant to force update to rownum instead. Conflicts: mod/assign/locallib.php --- mod/assign/locallib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index e1e5104..5ca90c2 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -1629,11 +1629,7 @@ class assign { if ($rownum == count($useridlist) - 1) { $last = true; } - // the placement of this is important so can pass the list of userids above - if ($offset) { - $_POST = array(); - } - if(!$userid){ + if (!$userid) { throw new coding_exception('Row is out of bounds for the current grading table: ' . $rownum); } $user = $DB->get_record('user', array('id' => $userid)); @@ -2941,6 +2937,7 @@ class assign { $mform->setType('id', PARAM_INT); $mform->addElement('hidden', 'rownum', $rownum); $mform->setType('rownum', PARAM_INT); + $mform->setConstant('rownum', $rownum); $mform->addElement('hidden', 'useridlist', implode(',', $useridlist)); $mform->setType('useridlist', PARAM_TEXT); $mform->addElement('hidden', 'ajax', optional_param('ajax', 0, PARAM_INT)); -- 1.7.9.5 From 3e8d7ca16e02062d5a4bb04115890531b5469bff Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Fri, 14 Sep 2012 09:33:02 +0100 Subject: [PATCH 688/903] MDL-35442 Add settings and uninstall link for local plugins --- lib/pluginlib.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/pluginlib.php b/lib/pluginlib.php index 76e50eb..b224d6d 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -2504,3 +2504,22 @@ class plugininfo_report extends plugininfo_base { return new moodle_url('/admin/reports.php', array('delete' => $this->name, 'sesskey' => sesskey())); } } + + +/** + * Class for local plugins + */ +class plugininfo_local extends plugininfo_base { + + public function get_uninstall_url() { + return new moodle_url('/admin/localplugins.php', array('delete' => $this->name, 'sesskey' => sesskey())); + } + + public function get_settings_url() { + if (file_exists($this->full_path('settings.php'))) { + return new moodle_url('/admin/settings.php', array('section' => 'local_' . $this->name)); + } else { + return parent::get_settings_url(); + } + } +} -- 1.7.9.5 From b666bddae27ec46c5ea113c652b08c0d6ed2f188 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 19 Sep 2012 12:56:51 +0800 Subject: [PATCH 689/903] MDL-35375: Ensure the assignment grading table is always sorted by at least one unique column Conflicts: mod/assign/gradingtable.php --- lib/tablelib.php | 10 +++++++--- mod/assign/gradingtable.php | 16 +++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/tablelib.php b/lib/tablelib.php index 04daa06..6de22af 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -451,9 +451,13 @@ class flexible_table { $this->sess->sortby = array_slice($this->sess->sortby, 0, $this->maxsortkeys); } - // If we didn't sort just now, then use the default sort order if one is defined and the column exists - if (empty($this->sess->sortby) && !empty($this->sort_default_column)) { - $this->sess->sortby = array ($this->sort_default_column => ($this->sort_default_order == SORT_DESC ? SORT_DESC : SORT_ASC)); + // MDL-35375 - If a default order is defined and it is not in the current list of order by columns, add it at the end. + // This prevents results from being returned in a random order if the only order by column contains equal values. + if (!empty($this->sort_default_column)) { + if (!array_key_exists($this->sort_default_column, $this->sess->sortby)) { + $defaultsort = array($this->sort_default_column => $this->sort_default_order); + $this->sess->sortby = array_merge($this->sess->sortby, $defaultsort); + } } $ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW); diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index 40bed66..fce13ea 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -118,12 +118,12 @@ class assign_grading_table extends table_sql implements renderable { $headers = array(); // Select - $columns[] = 'select'; - $headers[] = get_string('select') . '
    '; - - // Edit links if (!$this->is_downloading()) { - $columns[] = 'edit'; + $columns[] = 'select'; + $headers[] = get_string('select') . '
    '; + + // We have to call this column userid so we can use userid as a default sortable column. + $columns[] = 'userid'; $headers[] = get_string('edit'); } @@ -187,8 +187,10 @@ class assign_grading_table extends table_sql implements renderable { // set the columns $this->define_columns($columns); $this->define_headers($headers); + // We require at least one unique column for the sort. + $this->sortable(true, 'userid'); $this->no_sorting('finalgrade'); - $this->no_sorting('edit'); + $this->no_sorting('userid'); $this->no_sorting('select'); $this->no_sorting('outcomes'); @@ -430,7 +432,7 @@ class assign_grading_table extends table_sql implements renderable { * @param stdClass $row * @return string */ - function col_edit(stdClass $row) { + function col_userid(stdClass $row) { $edit = ''; if ($this->rownum < 0) { $this->rownum = $this->currpage * $this->pagesize; -- 1.7.9.5 From a1db00dd1aa0a593fe34cfb2a1b341639c49a9c1 Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Thu, 13 Sep 2012 12:30:32 +0800 Subject: [PATCH 690/903] MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal --- course/view.php | 3 +++ lib/navigationlib.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/course/view.php b/course/view.php index cb978d8..d9d0bdd 100644 --- a/course/view.php +++ b/course/view.php @@ -20,6 +20,7 @@ $marker = optional_param('marker',-1 , PARAM_INT); $switchrole = optional_param('switchrole',-1, PARAM_INT); $modchooser = optional_param('modchooser', -1, PARAM_BOOL); + $return = optional_param('return', 0, PARAM_LOCALURL); $params = array(); if (!empty($name)) { @@ -152,6 +153,8 @@ // Redirect to site root if Editing is toggled on frontpage if ($course->id == SITEID) { redirect($CFG->wwwroot .'/?redirect=0'); + } else if (!empty($return)) { + redirect($CFG->wwwroot . $return); } else { redirect($PAGE->url); } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 84ca77f..d9cd546 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3563,7 +3563,7 @@ class settings_navigation extends navigation_node { $baseurl->param('sesskey', sesskey()); } else { // Edit on the main course page. - $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey())); + $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>$this->page->url->out_as_local_url(false), 'sesskey'=>sesskey())); } $editurl = clone($baseurl); -- 1.7.9.5 From fede879cf238e919776cb351dd0f1b42a8ce1da0 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 13 Sep 2012 16:51:45 +0800 Subject: [PATCH 691/903] MDL-31499 Javascript: Handle invalid window names in openpopup --- lib/javascript-static.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 812fe07..068fb98 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1178,6 +1178,15 @@ function openpopup(event, args) { } } + // Cleans window name because IE does not support funky ones. + var nameregex = /[^a-z0-9_]/i; + if (args.name.match(nameregex)) { + args.name = args.name.replace(nameregex, '_'); + if (M.cfg.developerdebug) { + alert('DEVELOPER NOTICE: Invalid \'name\' passed to openpopup()'); + } + } + var fullurl = args.url; if (!args.url.match(/https?:\/\//)) { fullurl = M.cfg.wwwroot + args.url; -- 1.7.9.5 From 6b69bf463a626904a780d390223b3017fb5248dd Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Tue, 25 Sep 2012 09:56:11 +1200 Subject: [PATCH 692/903] MDL-34607 files: post integration version bump --- lib/db/upgrade.php | 4 ++-- version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 386792c..e617e1b 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -959,14 +959,14 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2012062501.14); } - if ($oldversion < 2012062502.02) { + if ($oldversion < 2012062502.03) { // Some folders still have a sortorder set, which is used for main files but is not // supported by the folder resource. We reset the value here. $sql = 'UPDATE {files} SET sortorder = ? WHERE component = ? AND filearea = ? AND sortorder <> ?'; $DB->execute($sql, array(0, 'mod_folder', 'content', 0)); // Main savepoint reached. - upgrade_main_savepoint(true, 2012062502.02); + upgrade_main_savepoint(true, 2012062502.03); } return true; diff --git a/version.php b/version.php index 601517c..a3d1c38 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.02; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.03; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -- 1.7.9.5 From 2bb3259fc30bb2333d28f0c52b86a240e1dbcb9d Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Wed, 19 Sep 2012 22:23:33 +0300 Subject: [PATCH 693/903] MDL-35537 - Right align registration text on login page, when in RTL mode --- theme/base/style/core.css | 1 + 1 file changed, 1 insertion(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 9661206..ca41690 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -284,6 +284,7 @@ input#id_externalurl {direction:ltr;} .loginbox .subcontent {margin:5px;padding:10px;text-align:center;} .loginbox .loginpanel .desc {margin:0;padding:0;margin-bottom:5px;} .loginbox .signuppanel .subcontent {text-align:left;} +.dir-rtl .loginbox .signuppanel .subcontent {text-align: right;} .loginbox .loginsub {margin-left:0;margin-right:0;} .loginbox .guestsub, .loginbox .forgotsub, -- 1.7.9.5 From a2b837e5becbf18cca12dc4c4fbb719e1b3a10f8 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 22 Sep 2012 17:19:18 +0300 Subject: [PATCH 694/903] MDL-35576 - Right padding is missing on Date field/element, when in RTL mode (minor fix) --- theme/base/style/core.css | 1 + 1 file changed, 1 insertion(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index ca41690..e930e07 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -211,6 +211,7 @@ a.skip:active {position: static;display: block;} .mform .fitem .fitemtitle div {display: inline;} .mform .fitem .felement {border-width: 0;width:80%;margin-left:16%;} .mform .fitem fieldset.felement {margin-left:15%;padding-left:1%;margin-bottom:0} +.dir-rtl .mform .fitem fieldset.felement {padding-right: 1%;margin-right: 15%;} .mform .error, .mform .required {color:#A00;} .mform .required .fgroup span label {color:#000;} -- 1.7.9.5 From ff61f14c0454f1a7e05ecd47f7f74d5528fcca31 Mon Sep 17 00:00:00 2001 From: Raymond Wijaya Date: Wed, 12 Sep 2012 14:19:32 +0800 Subject: [PATCH 695/903] MDL-35252: Fix a bug that creates unneccessary rows in grade_grades table when unchecking 'overridden' check box in gradebook update --- mod/assign/locallib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index d248681..8ba72d4 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -3380,7 +3380,7 @@ class assign { $graderesults = $DB->get_recordset_sql('SELECT u.id as userid, s.timemodified as datesubmitted, g.grade as rawgrade, g.timemodified as dategraded, g.grader as usermodified FROM {user} u LEFT JOIN {assign_submission} s ON u.id = s.userid and s.assignment = ? - LEFT JOIN {assign_grades} g ON u.id = g.userid and g.assignment = ? + JOIN {assign_grades} g ON u.id = g.userid and g.assignment = ? ' . $where, array($assignmentid, $assignmentid, $userid)); -- 1.7.9.5 From 792a3c4ea91bc96542606e74e36c671709621a19 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 26 Sep 2012 08:23:55 +1200 Subject: [PATCH 696/903] MDL-31976 course: Better alt for edit section icon --- course/format/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/format/renderer.php b/course/format/renderer.php index 26f7824..53891bc 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -169,7 +169,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base { $url = new moodle_url('/course/editsection.php', array('id'=>$section->id, 'sr'=>$sectionreturn)); $o.= html_writer::link($url, html_writer::empty_tag('img', array('src' => $this->output->pix_url('t/edit'), - 'class' => 'iconsmall edit', 'alt' => get_string('editsummary'))), + 'class' => 'iconsmall edit', 'alt' => get_string('edit'))), array('title' => get_string('editsummary'))); } $o.= html_writer::end_tag('div'); -- 1.7.9.5 From f0f3338000d29837203863a0d965671de7481fe1 Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Wed, 26 Sep 2012 10:17:21 +0800 Subject: [PATCH 697/903] MDL-34476 - Blocks - Fixing context issue --- blocks/completionstatus/block_completionstatus.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 2e00684..5caf743 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -51,8 +51,10 @@ class block_completionstatus extends block_base { // Create empty content $this->content = new stdClass(); + $context = get_context_instance(CONTEXT_COURSE, $course->id); + // Can edit settings? - $can_edit = has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id)); + $can_edit = has_capability('moodle/course:update', $context); // Get course completion data $info = new completion_info($course); -- 1.7.9.5 From 583c0cf67fd43967fa4b0e2d0033581a3175a930 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 13 Sep 2012 11:00:34 +0800 Subject: [PATCH 698/903] MDL-35276 fix redirect to course/section pages --- course/format/renderer.php | 25 ++++++++++++----------- course/lib.php | 44 +++++++++++++++++++++++++++++++--------- course/mod.php | 48 +++++++++++++------------------------------- course/modduplicate.php | 13 ++++++------ course/modedit.php | 6 +++--- lib/navigationlib.php | 4 +--- 6 files changed, 72 insertions(+), 68 deletions(-) diff --git a/course/format/renderer.php b/course/format/renderer.php index c758cac..4bb5a3a 100644 --- a/course/format/renderer.php +++ b/course/format/renderer.php @@ -65,8 +65,9 @@ abstract class format_section_renderer_base extends plugin_renderer_base { */ public function section_title($section, $course) { $title = get_section_name($course, $section); - if ($section->section != 0 && $course->coursedisplay == COURSE_DISPLAY_MULTIPAGE) { - $title = html_writer::link(course_get_url($course, $section->section), $title); + $url = course_get_url($course, $section->section, array('navigation' => true)); + if ($url) { + $title = html_writer::link($url, $title); } return $title; } @@ -125,7 +126,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base { * @param int $sectionreturn The section to return to after an action * @return string HTML to output. */ - protected function section_header($section, $course, $onsectionpage, $sectionreturn=0) { + protected function section_header($section, $course, $onsectionpage, $sectionreturn=null) { global $PAGE; $o = ''; @@ -413,7 +414,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base { * @param int $sectionno The section number in the coruse which is being dsiplayed * @return string HTML to output. */ - protected function course_activity_clipboard($course, $sectionno = 0) { + protected function course_activity_clipboard($course, $sectionno = null) { global $USER; $o = ''; @@ -642,7 +643,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base { echo $this->output->heading($this->page_title(), 2, 'accesshide'); // Copy activity clipboard.. - echo $this->course_activity_clipboard($course); + echo $this->course_activity_clipboard($course, 0); // Now the list of sections.. echo $this->start_section_list(); @@ -651,10 +652,10 @@ abstract class format_section_renderer_base extends plugin_renderer_base { $thissection = $sections[0]; unset($sections[0]); if ($thissection->summary or $thissection->sequence or $PAGE->user_is_editing()) { - echo $this->section_header($thissection, $course, false); - print_section($course, $thissection, $mods, $modnamesused, true); + echo $this->section_header($thissection, $course, false, 0); + print_section($course, $thissection, $mods, $modnamesused, true, "100%", false, 0); if ($PAGE->user_is_editing()) { - print_section_add_menus($course, 0, $modnames); + print_section_add_menus($course, 0, $modnames, false, false, 0); } echo $this->section_footer(); } @@ -693,11 +694,11 @@ abstract class format_section_renderer_base extends plugin_renderer_base { // Display section summary only. echo $this->section_summary($thissection, $course, $mods); } else { - echo $this->section_header($thissection, $course, false); + echo $this->section_header($thissection, $course, false, 0); if ($thissection->uservisible) { - print_section($course, $thissection, $mods, $modnamesused); + print_section($course, $thissection, $mods, $modnamesused, true, "100%", false, 0); if ($PAGE->user_is_editing()) { - print_section_add_menus($course, $section, $modnames); + print_section_add_menus($course, $section, $modnames, false, false, 0); } } echo $this->section_footer(); @@ -714,7 +715,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base { continue; } echo $this->stealth_section_header($section); - print_section($course, $thissection, $mods, $modnamesused); + print_section($course, $thissection, $mods, $modnamesused, true, "100%", false, $displaysection); echo $this->stealth_section_footer(); } diff --git a/course/lib.php b/course/lib.php index ac7a957..4ae8492 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1384,7 +1384,7 @@ function get_print_section_cm_text(cm_info $cm, $course) { * @param int $sectionreturn The section to return to * @return void */ -function print_section($course, $section, $mods, $modnamesused, $absolute=false, $width="100%", $hidecompletion=false, $sectionreturn=0) { +function print_section($course, $section, $mods, $modnamesused, $absolute=false, $width="100%", $hidecompletion=false, $sectionreturn=null) { global $CFG, $USER, $DB, $PAGE, $OUTPUT; static $initialised; @@ -1765,14 +1765,14 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, * Prints the menus to add activities and resources. * * @param stdClass $course The course - * @param stdClass $section The section + * @param int $section relative section number (field course_sections.section) * @param array $modnames An array containing the list of modules and their names * @param bool $vertical Vertical orientation * @param bool $return Return the menus or send them to output * @param int $sectionreturn The section to link back to * @return void|string depending on $return */ -function print_section_add_menus($course, $section, $modnames, $vertical=false, $return=false, $sectionreturn=0) { +function print_section_add_menus($course, $section, $modnames, $vertical=false, $return=false, $sectionreturn=null) { global $CFG, $OUTPUT; // check to see if user can add menus @@ -1781,7 +1781,7 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false, } // Retrieve all modules with associated metadata - $modules = get_module_metadata($course, $modnames); + $modules = get_module_metadata($course, $modnames, $sectionreturn); // We'll sort resources and activities into two lists $resources = array(); @@ -1894,7 +1894,7 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false, * @return array A list of stdClass objects containing metadata about each * module */ -function get_module_metadata($course, $modnames, $sectionreturn = 0) { +function get_module_metadata($course, $modnames, $sectionreturn = null) { global $CFG, $OUTPUT; // get_module_metadata will be called once per section on the page and courses may show @@ -3153,7 +3153,7 @@ function moveto_module($mod, $section, $beforemod=NULL) { * @param int $section The section to link back to * @return string XHTML for the editing buttons */ -function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $moveselect = true, $indent=-1, $section=-1) { +function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $moveselect = true, $indent=-1, $section=null) { global $CFG, $OUTPUT, $COURSE; static $str; @@ -3195,7 +3195,7 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele $baseurl = new moodle_url('/course/mod.php', array('sesskey' => sesskey())); - if ($section >= 0) { + if ($section !== null) { $baseurl->param('sr', $section); } $actions = array(); @@ -4589,15 +4589,39 @@ function include_course_ajax($course, $usedmodules = array(), $enabledmodules = * * @param stdClass $course The course to get the section name for * @param int $sectionno The section number to return a link to + * if omitted the course view page is returned + * @param array $options options for view URL. At the moment core uses: + * 'navigation' (bool) if true and section has no separate page, the function returns null + * 'sr' (int) used by multipage formats to specify to which section to return * @return moodle_url The url of course */ -function course_get_url($course, $sectionno = null) { +function course_get_url($course, $sectionno = null, $options = array()) { + if ($course->id == SITEID) { + return new moodle_url('/'); + } $url = new moodle_url('/course/view.php', array('id' => $course->id)); - if (!is_null($sectionno)) { - if ($course->coursedisplay == COURSE_DISPLAY_MULTIPAGE) { + $sr = null; + if (array_key_exists('sr', $options)) { + $sr = $options['sr']; + } + if ($sectionno !== null) { + if ($sr !== null) { + if ($sr) { + $usercoursedisplay = COURSE_DISPLAY_MULTIPAGE; + $sectionno = $sr; + } else { + $usercoursedisplay = COURSE_DISPLAY_SINGLEPAGE; + } + } else { + $usercoursedisplay = $course->coursedisplay; + } + if ($sectionno != 0 && $usercoursedisplay == COURSE_DISPLAY_MULTIPAGE) { $url->param('section', $sectionno); } else { + if (!empty($options['navigation'])) { + return null; + } $url->set_anchor('section-'.$sectionno); } } diff --git a/course/mod.php b/course/mod.php index 181c6c9..beb665c 100644 --- a/course/mod.php +++ b/course/mod.php @@ -26,7 +26,7 @@ require("../config.php"); require_once("lib.php"); -$sectionreturn = optional_param('sr', 0, PARAM_INT); +$sectionreturn = optional_param('sr', null, PARAM_INT); $add = optional_param('add', '', PARAM_ALPHA); $type = optional_param('type', '', PARAM_ALPHA); $indent = optional_param('indent', 0, PARAM_INT); @@ -50,9 +50,7 @@ foreach (compact('indent','update','hide','show','copy','moveto','movetosection' $url->param($key, $value); } } -if ($sectionreturn) { - $url->param('sr', $sectionreturn); -} +$url->param('sr', $sectionreturn); if ($add !== '') { $url->param('add', $add); } @@ -109,7 +107,7 @@ if (!empty($add)) { get_string('continue'), 'post'), new single_button( - course_get_url($course, $sectionreturn), + course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn)), get_string('cancel'), 'get') ); @@ -126,7 +124,7 @@ if (!empty($add)) { $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('moodle/course:manageactivities', $modcontext); - $return = course_get_url($course, $sectionreturn); + $return = course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn)); if (!$confirm or !confirm_sesskey()) { $fullmodulename = get_string('modulename', $cm->modname); @@ -234,11 +232,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { rebuild_course_cache($section->course); - if (SITEID == $section->course) { - redirect($CFG->wwwroot); - } else { - redirect(course_get_url($course, $sectionreturn)); - } + redirect(course_get_url($course, $section->section, array('sr' => $sectionreturn))); } else if (!empty($indent) and confirm_sesskey()) { $id = required_param('id', PARAM_INT); @@ -261,11 +255,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { rebuild_course_cache($cm->course); - if (SITEID == $cm->course) { - redirect($CFG->wwwroot); - } else { - redirect(course_get_url($course, $sectionreturn)); - } + redirect(course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn))); } else if (!empty($hide) and confirm_sesskey()) { $cm = get_coursemodule_from_id('', $hide, 0, true, MUST_EXIST); @@ -280,11 +270,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { rebuild_course_cache($cm->course); - if (SITEID == $cm->course) { - redirect($CFG->wwwroot); - } else { - redirect(course_get_url($course, $sectionreturn)); - } + redirect(course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn))); } else if (!empty($show) and confirm_sesskey()) { $cm = get_coursemodule_from_id('', $show, 0, true, MUST_EXIST); @@ -304,11 +290,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { rebuild_course_cache($cm->course); } - if (SITEID == $cm->course) { - redirect($CFG->wwwroot); - } else { - redirect(course_get_url($course, $sectionreturn)); - } + redirect(course_get_url($course, $section->section, array('sr' => $sectionreturn))); } else if ($groupmode > -1 and confirm_sesskey()) { $id = required_param('id', PARAM_INT); @@ -325,11 +307,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { rebuild_course_cache($cm->course); - if (SITEID == $cm->course) { - redirect($CFG->wwwroot); - } else { - redirect(course_get_url($course, $sectionreturn)); - } + redirect(course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn))); } else if (!empty($copy) and confirm_sesskey()) { // value = course module $cm = get_coursemodule_from_id('', $copy, 0, true, MUST_EXIST); @@ -347,18 +325,20 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) { $USER->activitycopyname = $cm->name; $USER->activitycopysectionreturn = $sectionreturn; - redirect(course_get_url($course, $sectionreturn)); + redirect(course_get_url($course, $section->section, array('sr' => $sectionreturn))); } else if (!empty($cancelcopy) and confirm_sesskey()) { // value = course module $courseid = $USER->activitycopycourse; $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST); + $cm = get_coursemodule_from_id('', $USER->activitycopy, 0, true, IGNORE_MISSING); + $sectionreturn = $USER->activitycopysectionreturn; unset($USER->activitycopy); unset($USER->activitycopycourse); unset($USER->activitycopyname); - - redirect(course_get_url($course, $sectionreturn)); + unset($USER->activitycopysectionreturn); + redirect(course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn))); } else { print_error('unknowaction'); } diff --git a/course/modduplicate.php b/course/modduplicate.php index 30c9aaf..2f51ff9 100644 --- a/course/modduplicate.php +++ b/course/modduplicate.php @@ -34,7 +34,7 @@ require_once($CFG->libdir . '/filelib.php'); $cmid = required_param('cmid', PARAM_INT); $courseid = required_param('course', PARAM_INT); -$sectionreturn = optional_param('sr', 0, PARAM_INT); +$sectionreturn = optional_param('sr', null, PARAM_INT); $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST); $cm = get_coursemodule_from_id('', $cmid, $course->id, true, MUST_EXIST); @@ -61,8 +61,8 @@ $a->modtype = get_string('modulename', $cm->modname); $a->modname = format_string($cm->name); if (!plugin_supports('mod', $cm->modname, FEATURE_BACKUP_MOODLE2)) { - $url = new moodle_url('/course/view.php#section-' . $cm->sectionnum, array('id' => $course->id)); - print_error('duplicatenosupport', 'core', $url, $a); + $url = course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn)); + print_error('duplicatenosupport', 'error', $url, $a); } // backup the activity @@ -91,7 +91,8 @@ if (!$rc->execute_precheck()) { echo $output->header(); echo $output->precheck_notices($precheckresults); - echo $output->continue_button(new moodle_url('/course/view.php', array('id' => $course->id))); + $url = course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn)); + echo $output->continue_button($url); echo $output->footer(); die(); } @@ -137,14 +138,14 @@ if ($newcmid) { get_string('duplicatecontedit'), 'get'), new single_button( - course_get_url($course, $sectionreturn), + course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn)), get_string('duplicatecontcourse'), 'get') ); } else { echo $output->notification(get_string('duplicatesuccess', 'core', $a), 'notifysuccess'); - echo $output->continue_button(course_get_url($course, $sectionreturn)); + echo $output->continue_button(course_get_url($course, $cm->sectionnum, array('sr' => $sectionreturn))); } echo $output->footer(); diff --git a/course/modedit.php b/course/modedit.php index ff98613..7aa8667 100644 --- a/course/modedit.php +++ b/course/modedit.php @@ -35,7 +35,7 @@ $add = optional_param('add', '', PARAM_ALPHA); // module name $update = optional_param('update', 0, PARAM_INT); $return = optional_param('return', 0, PARAM_BOOL); //return to course/view.php if false or mod/modname/view.php if true $type = optional_param('type', '', PARAM_ALPHANUM); //TODO: hopefully will be removed in 2.0 -$sectionreturn = optional_param('sr', 0, PARAM_INT); +$sectionreturn = optional_param('sr', null, PARAM_INT); $url = new moodle_url('/course/modedit.php'); $url->param('sr', $sectionreturn); @@ -264,7 +264,7 @@ if ($mform->is_cancelled()) { if ($return && !empty($cm->id)) { redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id"); } else { - redirect(course_get_url($course, $sectionreturn)); + redirect(course_get_url($course, $cw->section, array('sr' => $sectionreturn))); } } else if ($fromform = $mform->get_data()) { if (empty($fromform->coursemodule)) { @@ -633,7 +633,7 @@ if ($mform->is_cancelled()) { redirect($gradingman->get_management_url($returnurl)); } } else { - redirect(course_get_url($course, $sectionreturn)); + redirect(course_get_url($course, $cw->section, array('sr' => $sectionreturn))); } exit; diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 84ca77f..b24c112 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2026,9 +2026,7 @@ class global_navigation extends navigation_node { // pre 2.3 style format url $url = $urlfunction($course->id, $section->section); }else{ - if ($course->coursedisplay == COURSE_DISPLAY_MULTIPAGE) { - $url = course_get_url($course, $section->section); - } + $url = course_get_url($course, $section->section, array('navigation' => true)); } $sectionnode = $coursenode->add($sectionname, $url, navigation_node::TYPE_SECTION, null, $section->id); $sectionnode->nodetype = navigation_node::NODETYPE_BRANCH; -- 1.7.9.5 From 3f676aa5bdbd3b6e5edbb09dfe66c8217b232169 Mon Sep 17 00:00:00 2001 From: Jerome Mouneyrac Date: Wed, 26 Sep 2012 14:24:29 +0800 Subject: [PATCH 699/903] MDL-35644 user_get_details: admin should be able to see description --- user/lib.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/user/lib.php b/user/lib.php index 0da89c7..2f8bc60 100644 --- a/user/lib.php +++ b/user/lib.php @@ -324,15 +324,13 @@ function user_get_user_details($user, $course = null, array $userfields = array( $userdetails['phone2'] = $user->phone2; } - if (isset($user->description) && (!isset($hiddenfields['description']) or $isadmin)) { - if (!$cannotviewdescription) { - - if (in_array('description', $userfields)) { - // Always return the descriptionformat if description is requested. - list($userdetails['description'], $userdetails['descriptionformat']) = - external_format_text($user->description, $user->descriptionformat, - $usercontext->id, 'user', 'profile', null); - } + if (isset($user->description) && + ((!isset($hiddenfields['description']) && !$cannotviewdescription) or $isadmin)) { + if (in_array('description', $userfields)) { + // Always return the descriptionformat if description is requested. + list($userdetails['description'], $userdetails['descriptionformat']) = + external_format_text($user->description, $user->descriptionformat, + $usercontext->id, 'user', 'profile', null); } } -- 1.7.9.5 From 25878bcd22bed18c9bc9e7904503eb4b0df7d7ca Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Wed, 26 Sep 2012 15:16:24 +0800 Subject: [PATCH 700/903] MDL-35276 fix redirect to course/section pages --- course/modduplicate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/modduplicate.php b/course/modduplicate.php index 2f51ff9..e72f0d0 100644 --- a/course/modduplicate.php +++ b/course/modduplicate.php @@ -134,7 +134,7 @@ if ($newcmid) { echo $output->confirm( get_string('duplicatesuccess', 'core', $a), new single_button( - new moodle_url('/course/modedit.php', array('update' => $newcmid)), + new moodle_url('/course/modedit.php', array('update' => $newcmid, 'sr' => $sectionreturn)), get_string('duplicatecontedit'), 'get'), new single_button( -- 1.7.9.5 From 3147b59c8af3a18ae4f0c0476279e519f3b3ad87 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 22 Sep 2012 17:58:20 +0300 Subject: [PATCH 701/903] MDL-35578 - Left justify LTR Form input fields (email, idnumber, url, phone...), when in RTL mode --- theme/base/style/core.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index e930e07..5c0e78e 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -666,6 +666,11 @@ body.tag .managelink {padding: 5px;} .dir-rtl .felement.feditor select {margin-right:18.75%;margin-left:auto;} .dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;text-align: right;} +.dir-rtl .mform .fitem .felement input[name=email], +.dir-rtl .mform .fitem .felement input[name=url], +.dir-rtl .mform .fitem .felement input[name=idnumber], +.dir-rtl .mform .fitem .felement input[name=phone1], +.dir-rtl .mform .fitem .felement input[name=phone2] {text-align: left; direction: ltr;} /* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */ .resourcecontent .mediaplugin_mp3 object {height:25px; width: 600px} -- 1.7.9.5 From 249d0730584aafc74ff1f49a0c50581de857ed81 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 26 Sep 2012 19:48:06 +0200 Subject: [PATCH 702/903] MDL-35578 - Also justify email2, used in signup --- theme/base/style/core.css | 1 + 1 file changed, 1 insertion(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 5c0e78e..6a7abea 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -667,6 +667,7 @@ body.tag .managelink {padding: 5px;} .dir-rtl .felement.feditor select {margin-right:18.75%;margin-left:auto;} .dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;text-align: right;} .dir-rtl .mform .fitem .felement input[name=email], +.dir-rtl .mform .fitem .felement input[name=email2], .dir-rtl .mform .fitem .felement input[name=url], .dir-rtl .mform .fitem .felement input[name=idnumber], .dir-rtl .mform .fitem .felement input[name=phone1], -- 1.7.9.5 From 68164ad218c54fedacca860a62b4f3933a1a12d7 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Wed, 19 Sep 2012 22:43:45 +0300 Subject: [PATCH 703/903] MDL-35527 - Left justify CLOSE button on modal dialog boxes, when in RTL mode --- theme/base/style/core.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 6a7abea..3aec3d8 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -863,6 +863,10 @@ sup {vertical-align: super;} filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#CCCCCC')!important; filter: dropshadow(color=#FFFFFF, offx=1, offy=1); } +/* Activity Chooser "Close" button */ +.dir-rtl .moodle-dialogue-base .closebutton {float: left;} +/* Question Bank - Question Chooser "Close" button */ +#page-question-edit.dir-rtl a.container-close {right:auto;left:6px;} .chooserdialogue .moodle-dialogue-bd { font-size: 12px; -- 1.7.9.5 From 2a8690dab5e7ae6410145ec37e1a26ef16e6cd32 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 22 Sep 2012 21:42:12 +0300 Subject: [PATCH 704/903] MDL-35246 - Invert all action arrows in Question Bank categories management, when in RTL mode --- lib/listlib.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/listlib.php b/lib/listlib.php index 7a3979b..9cc815b 100644 --- a/lib/listlib.php +++ b/lib/listlib.php @@ -548,6 +548,14 @@ abstract class list_item { $strmovedown = get_string('movedown'); $strmoveleft = get_string('maketoplevelitem', 'question'); + if (right_to_left()) { // Exchange arrows on RTL + $rightarrow = 'left'; + $leftarrow = 'right'; + } else { + $rightarrow = 'right'; + $leftarrow = 'left'; + } + if (isset($this->parentlist->parentitem)) { $parentitem = $this->parentlist->parentitem; if (isset($parentitem->parentlist->parentitem)) { @@ -556,7 +564,7 @@ abstract class list_item { $action = $strmoveleft; } $url = new moodle_url($this->parentlist->pageurl, (array('sesskey'=>sesskey(), 'left'=>$this->id))); - $this->icons['left'] = $this->image_icon($action, $url, 'left'); + $this->icons['left'] = $this->image_icon($action, $url, $leftarrow); } else { $this->icons['left'] = $this->image_spacer(); } @@ -578,7 +586,7 @@ abstract class list_item { if (!empty($lastitem)) { $makechildof = get_string('makechildof', 'question', $lastitem->name); $url = new moodle_url($this->parentlist->pageurl, (array('sesskey'=>sesskey(), 'right'=>$this->id))); - $this->icons['right'] = $this->image_icon($makechildof, $url, 'right'); + $this->icons['right'] = $this->image_icon($makechildof, $url, $rightarrow); } else { $this->icons['right'] = $this->image_spacer(); } -- 1.7.9.5 From 20a1f8a9c512e79fe87c9c7723cbbb6efbe64d74 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 22 Sep 2012 21:05:14 +0300 Subject: [PATCH 705/903] MDL-35481 - Invert "search option" listbox "open" arrow, when in RTL mode (page: manual user course registration ) and Personal Blog page --- comment/comment.js | 8 +++++++- comment/lib.php | 8 +++++++- enrol/manual/yui/quickenrolment/quickenrolment.js | 11 +++++++++-- lib/javascript-static.js | 16 ++++++++++++++-- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/comment/comment.js b/comment/comment.js index a16b83a..f137299 100644 --- a/comment/comment.js +++ b/comment/comment.js @@ -361,7 +361,13 @@ bodyContent: '
    '); + this.icon = Y.Node.create(''); // Shrink the div as it is collapsed by default this.div.setStyle('height', caption.get('offsetHeight')+'px'); } else { @@ -126,8 +132,14 @@ M.util.CollapsibleRegion = function(Y, id, userpref, strtooltip) { // Handler for the animation finishing. animation.on('end', function() { this.div.toggleClass('collapsed'); + var collapsedimage = 't/collapsed'; // ltr mode + if ( Y.one(document.body).hasClass('dir-rtl') ) { + collapsedimage = 't/collapsed_rtl'; + } else { + collapsedimage = 't/collapsed'; + } if (this.div.hasClass('collapsed')) { - this.icon.set('src', M.util.image_url('t/collapsed', 'moodle')); + this.icon.set('src', M.util.image_url(collapsedimage, 'moodle')); } else { this.icon.set('src', M.util.image_url('t/expanded', 'moodle')); } -- 1.7.9.5 From 66652c60c080eea9bac0e25785df9a23186a8e54 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 27 Sep 2012 00:34:44 +0000 Subject: [PATCH 706/903] Automatically generated installer lang files --- install/lang/no/install.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/lang/no/install.php b/install/lang/no/install.php index 795f77d..bd29cd8 100644 --- a/install/lang/no/install.php +++ b/install/lang/no/install.php @@ -34,12 +34,14 @@ $string['admindirname'] = 'Adminmappe'; $string['availablelangs'] = 'Tilgjengelige språkpakker'; $string['chooselanguagehead'] = 'Velg et språk'; $string['chooselanguagesub'] = 'Velg språk (bare for INSTALLASJONEN). Du vil kunne velge språk for nettsted og bruker på et skjermbilde senere.'; -$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede, vær vennlig å bruk admin/cli/upgrade.php hvis du vil oppgradere nettstedet ditt.'; +$string['clialreadyconfigured'] = 'Filen config.php finnes allerede. Vennligst bruk admin/cli/install_database.php hvis du vil installere denne portalen.'; +$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede. Vennligst bruk admin/cli/upgrade.php hvis du vil oppgradere denne portalen.'; $string['cliinstallheader'] = 'Moodle {$a} kommandolinje installasjonsprogram'; $string['databasehost'] = 'Databasevert'; $string['databasename'] = 'Databasenavn'; $string['databasetypehead'] = 'Velg databasedriver'; $string['dataroot'] = 'Dataområde'; +$string['datarootpermission'] = 'Tillatelse for datakatalog'; $string['dbprefix'] = 'Tabellprefix'; $string['dirroot'] = 'Moodles filområde'; $string['environmenthead'] = 'Sjekker "omgivelsene" dine...'; @@ -76,11 +78,10 @@ $string['phpversionhelp'] = '

    Moodle trenger en PHP versjon minst 4.3.0 eller

    Du må oppgradere PHP eller flytte til en server med en nyere versjon av PHP!
    (I forhold til 5.0.x kan du også nedgradere til versjon 4.4.x)

    '; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; -$string['welcomep20'] = 'Du ser denne siden fordi du nå med hell har installert og kjørt {$a->packname} {$a->packversion}pakke på datamaskinen din. Gratulerer!'; +$string['welcomep20'] = 'Du ser denne siden fordi du nå med hell har installert og kjørt {$a->packname} {$a->packversion}pakken på datamaskinen din. Gratulerer!'; $string['welcomep30'] = 'Denne versjonen av {$a->installername} inkluderer programmer for å lage et miljø som Moodle jobber i, nemlig:'; $string['welcomep40'] = 'Denne pakken inkluderer også Moodle {$a->moodlerelease} ({$a->moodleversion}).'; -$string['welcomep50'] = 'Bruken av alle applikasjoner i denne pakken er administrert av egne lisenser. Hele {$a->installername} pakken er     -åpen kildekode og er distribuert under GPL lisensen.'; -$string['welcomep60'] = 'De følgende sidene vil vise deg gjennom noen enkle steg for å konfigurere og sette opp Moodle på datamaskinen din. Du kan akseptere standard innstillinger, eller, hvis du vil, justere dem etter egne behov.'; +$string['welcomep50'] = 'Bruken av alle applikasjoner i denne pakken er styrt av egne lisenser. Hele {$a->installername} pakken er åpen kildekode og er distribuert under GPL lisensen.'; +$string['welcomep60'] = 'De følgende sidene vil vise deg gjennom noen enkle steg for å konfigurere og sette opp Moodle på datamaskinen din. Du kan akseptere standardinnstillingene, eller, hvis du vil, justere dem etter egne behov.'; $string['welcomep70'] = 'Klikk på "Neste" knappen under for å fortsette med Moodle-installasjonen'; $string['wwwroot'] = 'Web addresse'; -- 1.7.9.5 From 12f9c36df8ca11a5aa53672442b71cc76c47814d Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 27 Sep 2012 11:32:02 +0800 Subject: [PATCH 707/903] Revert "MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal" This reverts commit a1db00dd1aa0a593fe34cfb2a1b341639c49a9c1. --- course/view.php | 3 --- lib/navigationlib.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/course/view.php b/course/view.php index d9d0bdd..cb978d8 100644 --- a/course/view.php +++ b/course/view.php @@ -20,7 +20,6 @@ $marker = optional_param('marker',-1 , PARAM_INT); $switchrole = optional_param('switchrole',-1, PARAM_INT); $modchooser = optional_param('modchooser', -1, PARAM_BOOL); - $return = optional_param('return', 0, PARAM_LOCALURL); $params = array(); if (!empty($name)) { @@ -153,8 +152,6 @@ // Redirect to site root if Editing is toggled on frontpage if ($course->id == SITEID) { redirect($CFG->wwwroot .'/?redirect=0'); - } else if (!empty($return)) { - redirect($CFG->wwwroot . $return); } else { redirect($PAGE->url); } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index dcf466a..b24c112 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3561,7 +3561,7 @@ class settings_navigation extends navigation_node { $baseurl->param('sesskey', sesskey()); } else { // Edit on the main course page. - $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>$this->page->url->out_as_local_url(false), 'sesskey'=>sesskey())); + $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey())); } $editurl = clone($baseurl); -- 1.7.9.5 From 40755f958417db53b662217b42502281fd5ea5b1 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 27 Sep 2012 11:58:47 +0800 Subject: [PATCH 708/903] MDL-35637 group: Fix form submission error that occurs when GD version is not set. --- group/lib.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/group/lib.php b/group/lib.php index 8addc93..024e81b 100644 --- a/group/lib.php +++ b/group/lib.php @@ -239,17 +239,18 @@ function groups_update_group_icon($group, $data, $editform) { $context = get_context_instance(CONTEXT_COURSE, $group->courseid, MUST_EXIST); //TODO: it would make sense to allow picture deleting too (skodak) - - if ($iconfile = $editform->save_temp_file('imagefile')) { - if (process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) { - $DB->set_field('groups', 'picture', 1, array('id'=>$group->id)); - $group->picture = 1; - } else { - $fs->delete_area_files($context->id, 'group', 'icon', $group->id); - $DB->set_field('groups', 'picture', 0, array('id'=>$group->id)); - $group->picture = 0; + if (!empty($CFG->gdversion)) { + if ($iconfile = $editform->save_temp_file('imagefile')) { + if (process_new_icon($context, 'group', 'icon', $group->id, $iconfile)) { + $DB->set_field('groups', 'picture', 1, array('id'=>$group->id)); + $group->picture = 1; + } else { + $fs->delete_area_files($context->id, 'group', 'icon', $group->id); + $DB->set_field('groups', 'picture', 0, array('id'=>$group->id)); + $group->picture = 0; + } + @unlink($iconfile); } - @unlink($iconfile); } } -- 1.7.9.5 From 786b83165334d3d8f0574ca006ebd9e9bc11fe59 Mon Sep 17 00:00:00 2001 From: Jerome Mouneyrac Date: Wed, 26 Sep 2012 15:20:18 +0800 Subject: [PATCH 709/903] MDL-35198 replace key_exists by array_key_exists --- admin/webservice/service_users.php | 2 +- blocks/community/forms.php | 2 +- course/externallib.php | 10 +++++----- enrol/externallib.php | 4 ++-- enrol/manual/externallib.php | 2 +- lib/adminlib.php | 2 +- lib/upgradelib.php | 4 ++-- webservice/lib.php | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/webservice/service_users.php b/admin/webservice/service_users.php index 12db2b0..ad67c668 100644 --- a/admin/webservice/service_users.php +++ b/admin/webservice/service_users.php @@ -97,7 +97,7 @@ $usersmissingcaps = $webservicemanager->get_missing_capabilities_by_users($allow //add the missing capabilities to the allowed users object to be displayed by renderer foreach ($allowedusers as &$alloweduser) { - if (!is_siteadmin($alloweduser->id) and key_exists($alloweduser->id, $usersmissingcaps)) { + if (!is_siteadmin($alloweduser->id) and array_key_exists($alloweduser->id, $usersmissingcaps)) { $alloweduser->missingcapabilities = implode(', ', $usersmissingcaps[$alloweduser->id]); } } diff --git a/blocks/community/forms.php b/blocks/community/forms.php index fafab8a..5026d5b 100644 --- a/blocks/community/forms.php +++ b/blocks/community/forms.php @@ -140,7 +140,7 @@ class community_hub_search_form extends moodleform { $options = array(); $firsthub = false; foreach ($hubs as $hub) { - if (key_exists('id', $hub)) { + if (array_key_exists('id', $hub)) { $params = array('hubid' => $hub['id'], 'filetype' => HUB_HUBSCREENSHOT_FILE_TYPE); $imgurl = new moodle_url(HUB_HUBDIRECTORYURL . diff --git a/course/externallib.php b/course/externallib.php index b18c0a4..88fd0fa 100644 --- a/course/externallib.php +++ b/course/externallib.php @@ -285,7 +285,7 @@ class core_course_external extends external_api { array('options' => $options)); //retrieve courses - if (!key_exists('ids', $params['options']) + if (!array_key_exists('ids', $params['options']) or empty($params['options']['ids'])) { $courses = $DB->get_records('course'); } else { @@ -523,12 +523,12 @@ class core_course_external extends external_api { require_capability('moodle/course:create', $context); // Make sure lang is valid - if (key_exists('lang', $course) and empty($availablelangs[$course['lang']])) { + if (array_key_exists('lang', $course) and empty($availablelangs[$course['lang']])) { throw new moodle_exception('errorinvalidparam', 'webservice', '', 'lang'); } // Make sure theme is valid - if (key_exists('forcetheme', $course)) { + if (array_key_exists('forcetheme', $course)) { if (!empty($CFG->allowcoursethemes)) { if (empty($availablethemes[$course['forcetheme']])) { throw new moodle_exception('errorinvalidparam', 'webservice', '', 'forcetheme'); @@ -547,10 +547,10 @@ class core_course_external extends external_api { //set default value for completion $courseconfig = get_config('moodlecourse'); if (completion_info::is_enabled_for_site()) { - if (!key_exists('enablecompletion', $course)) { + if (!array_key_exists('enablecompletion', $course)) { $course['enablecompletion'] = $courseconfig->enablecompletion; } - if (!key_exists('completionstartonenrol', $course)) { + if (!array_key_exists('completionstartonenrol', $course)) { $course['completionstartonenrol'] = $courseconfig->completionstartonenrol; } } else { diff --git a/enrol/externallib.php b/enrol/externallib.php index 7d2fb5a..7e8dd4c 100644 --- a/enrol/externallib.php +++ b/enrol/externallib.php @@ -388,7 +388,7 @@ class core_role_external extends external_api { // throw an exception if user is not able to assign the role in this context $roles = get_assignable_roles($context, ROLENAME_SHORT); - if (!key_exists($assignment['roleid'], $roles)) { + if (!array_key_exists($assignment['roleid'], $roles)) { throw new invalid_parameter_exception('Can not assign roleid='.$assignment['roleid'].' in contextid='.$assignment['contextid']); } @@ -451,7 +451,7 @@ class core_role_external extends external_api { // throw an exception if user is not able to unassign the role in this context $roles = get_assignable_roles($context, ROLENAME_SHORT); - if (!key_exists($unassignment['roleid'], $roles)) { + if (!array_key_exists($unassignment['roleid'], $roles)) { throw new invalid_parameter_exception('Can not unassign roleid='.$unassignment['roleid'].' in contextid='.$unassignment['contextid']); } diff --git a/enrol/manual/externallib.php b/enrol/manual/externallib.php index 44d90ac..81907a8 100644 --- a/enrol/manual/externallib.php +++ b/enrol/manual/externallib.php @@ -101,7 +101,7 @@ class enrol_manual_external extends external_api { //throw an exception if user is not able to assign the role $roles = get_assignable_roles($context); - if (!key_exists($enrolment['roleid'], $roles)) { + if (!array_key_exists($enrolment['roleid'], $roles)) { $errorparams = new stdClass(); $errorparams->roleid = $enrolment['roleid']; $errorparams->courseid = $enrolment['courseid']; diff --git a/lib/adminlib.php b/lib/adminlib.php index 2e8121b..c74e557 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -7561,7 +7561,7 @@ class admin_setting_managewebservicetokens extends admin_setting { array(array('id' => $token->userid)), $token->serviceid); if (!is_siteadmin($token->userid) and - key_exists($token->userid, $usermissingcaps)) { + array_key_exists($token->userid, $usermissingcaps)) { $missingcapabilities = implode(', ', $usermissingcaps[$token->userid]); if (!empty($missingcapabilities)) { diff --git a/lib/upgradelib.php b/lib/upgradelib.php index c299ffe..cde67d9 100644 --- a/lib/upgradelib.php +++ b/lib/upgradelib.php @@ -964,7 +964,7 @@ function external_update_descriptions($component) { $dbfunction->classpath = $function['classpath']; $update = true; } - $functioncapabilities = key_exists('capabilities', $function)?$function['capabilities']:''; + $functioncapabilities = array_key_exists('capabilities', $function)?$function['capabilities']:''; if ($dbfunction->capabilities != $functioncapabilities) { $dbfunction->capabilities = $functioncapabilities; $update = true; @@ -980,7 +980,7 @@ function external_update_descriptions($component) { $dbfunction->methodname = $function['methodname']; $dbfunction->classpath = empty($function['classpath']) ? null : $function['classpath']; $dbfunction->component = $component; - $dbfunction->capabilities = key_exists('capabilities', $function)?$function['capabilities']:''; + $dbfunction->capabilities = array_key_exists('capabilities', $function)?$function['capabilities']:''; $dbfunction->id = $DB->insert_record('external_functions', $dbfunction); } unset($functions); diff --git a/webservice/lib.php b/webservice/lib.php index 5a14d57..326091a 100644 --- a/webservice/lib.php +++ b/webservice/lib.php @@ -564,7 +564,7 @@ class webservice { //detect the missing capabilities foreach ($servicecaps as $functioname => $functioncaps) { foreach ($functioncaps as $functioncap) { - if (!key_exists($functioncap, $usercaps)) { + if (!array_key_exists($functioncap, $usercaps)) { if (!isset($usersmissingcaps[$user->id]) or array_search($functioncap, $usersmissingcaps[$user->id]) === false) { $usersmissingcaps[$user->id][] = $functioncap; -- 1.7.9.5 From 9273bd1abb534cbcc02cd5baf1482165fcbae2b5 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 27 Sep 2012 18:51:24 +0800 Subject: [PATCH 710/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index a3d1c38..48fc6b2 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.03; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.04; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20120920)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20120927)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From d205afe662ba306833a525d87714d1994467dba7 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 12 Jul 2012 18:39:01 +0100 Subject: [PATCH 711/903] MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. --- mod/quiz/attempt.php | 4 ++-- mod/quiz/review.php | 3 ++- mod/quiz/summary.php | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 135ae14..1cbda08 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -76,8 +76,9 @@ if ($attemptobj->is_finished()) { // Check the access rules. $accessmanager = $attemptobj->get_access_manager(time()); -$messages = $accessmanager->prevent_access(); +$accessmanager->setup_attempt_page($PAGE); $output = $PAGE->get_renderer('mod_quiz'); +$messages = $accessmanager->prevent_access(); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -120,7 +121,6 @@ $title = get_string('attempt', 'quiz', $attemptobj->get_attempt_number()); $headtags = $attemptobj->get_html_head_contributions($page); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); -$accessmanager->setup_attempt_page($PAGE); if ($attemptobj->is_last_page($page)) { $nextpage = -1; diff --git a/mod/quiz/review.php b/mod/quiz/review.php index c19afaa..eacc703 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -52,6 +52,8 @@ $attemptobj->check_review_capability(); // Create an object to manage all the other (non-roles) access rules. $accessmanager = $attemptobj->get_access_manager(time()); +$accessmanager->setup_attempt_page($PAGE); + $options = $attemptobj->get_display_options(true); // Check permissions. @@ -103,7 +105,6 @@ if ($attemptobj->is_preview_user() && $attemptobj->is_own_attempt()) { $headtags = $attemptobj->get_html_head_contributions($page, $showall); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); -$accessmanager->setup_attempt_page($PAGE); // Summary table start. ============================================================================ diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index 303638f..822e307 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -52,8 +52,9 @@ if ($attemptobj->is_preview_user()) { // Check access. $accessmanager = $attemptobj->get_access_manager(time()); -$messages = $accessmanager->prevent_access(); +$accessmanager->setup_attempt_page($PAGE); $output = $PAGE->get_renderer('mod_quiz'); +$messages = $accessmanager->prevent_access(); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -89,7 +90,6 @@ $PAGE->blocks->add_fake_block($navbc, reset($regions)); $PAGE->navbar->add(get_string('summaryofattempt', 'quiz')); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); -$accessmanager->setup_attempt_page($PAGE); // Display the page. echo $output->summary_page($attemptobj, $displayoptions); -- 1.7.9.5 From ad1a52e07cd3033ab02f51eafa683376169f4155 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 13 Sep 2012 19:12:45 +0100 Subject: [PATCH 712/903] MDL-35370 cloze qtype: distinguish wrong & unanswered subqs This affects the subquestions that appear as an embedded text input box. There are three cases: 1. Input for subq left blank 2. Input for subq was wrong, and matched by a * wildcard. 3. Input for subq was wrong, and did not match any answer. 2. and 3. should look identical, apart from any feedback in case 2. 1. is different. The state should be displayed as "Not answered" even though the mark for this part is still shown as 0. There are some new unit tests for these cases. Also, we slighly improve handling of , for decimal point in multianswer, although there are still issues. While working on this, I made some minor clean-ups in shortanswer and numerical qtypes. --- question/type/multianswer/renderer.php | 30 +++++- question/type/multianswer/tests/helper.php | 46 +++++++- .../type/multianswer/tests/walkthrough_test.php | 114 +++++++++++++++++++- question/type/numerical/question.php | 12 ++- question/type/numerical/tests/question_test.php | 5 + question/type/shortanswer/question.php | 6 +- question/type/shortanswer/questiontype.php | 2 +- 7 files changed, 203 insertions(+), 12 deletions(-) diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php index 547a370d..682e905 100644 --- a/question/type/multianswer/renderer.php +++ b/question/type/multianswer/renderer.php @@ -177,13 +177,18 @@ class qtype_multianswer_textfield_renderer extends qtype_multianswer_subq_render if ($subq->qtype->name() == 'shortanswer') { $matchinganswer = $subq->get_matching_answer(array('answer' => $response)); } else if ($subq->qtype->name() == 'numerical') { - $matchinganswer = $subq->get_matching_answer($response, 1); + list($value, $unit, $multiplier) = $subq->ap->apply_units($response, ''); + $matchinganswer = $subq->get_matching_answer($value, 1); } else { $matchinganswer = $subq->get_matching_answer($response); } if (!$matchinganswer) { - $matchinganswer = new question_answer(0, '', null, '', FORMAT_HTML); + if (is_null($response) || $response === '') { + $matchinganswer = new question_answer(0, '', null, '', FORMAT_HTML); + } else { + $matchinganswer = new question_answer(0, '', 0.0, '', FORMAT_HTML); + } } // Work out a good input field size. @@ -281,6 +286,9 @@ class qtype_multianswer_multichoice_inline_renderer $order = $subq->get_order($qa); $correctresponses = $subq->get_correct_response(); $rightanswer = $subq->answers[$order[reset($correctresponses)]]; + if (!$matchinganswer) { + $matchinganswer = new question_answer(0, '', null, '', FORMAT_HTML); + } $feedbackpopup = $this->feedback_popup($subq, $matchinganswer->fraction, $subq->format_text($matchinganswer->feedback, $matchinganswer->feedbackformat, $qa, 'question', 'answerfeedback', $matchinganswer->id), @@ -366,16 +374,30 @@ class qtype_multianswer_multichoice_vertical_renderer extends qtype_multianswer_ $result .= $this->all_choices_wrapper_end(); + $feedback = array(); if ($options->feedback && $options->marks >= question_display_options::MARK_AND_MAX && $subq->maxmark > 0) { $a = new stdClass(); $a->mark = format_float($fraction * $subq->maxmark, $options->markdp); $a->max = format_float($subq->maxmark, $options->markdp); - $result .= html_writer::tag('div', get_string('markoutofmax', 'question', $a), - array('class' => 'outcome')); + $feedback[] = html_writer::tag('div', get_string('markoutofmax', 'question', $a)); + } + + if ($options->rightanswer) { + foreach ($subq->answers as $ans) { + if (question_state::graded_state_for_fraction($ans->fraction) == + question_state::$gradedright) { + $feedback[] = get_string('correctansweris', 'qtype_multichoice', + $subq->format_text($ans->answer, $ans->answerformat, + $qa, 'question', 'answer', $ansid)); + break; + } + } } + $result .= html_writer::nonempty_tag('div', implode('
    ', $feedback), array('class' => 'outcome')); + return $result; } diff --git a/question/type/multianswer/tests/helper.php b/question/type/multianswer/tests/helper.php index 75a3d7d..3a77001 100644 --- a/question/type/multianswer/tests/helper.php +++ b/question/type/multianswer/tests/helper.php @@ -38,7 +38,7 @@ require_once($CFG->dirroot . '/question/type/multianswer/question.php'); */ class qtype_multianswer_test_helper extends question_test_helper { public function get_test_questions() { - return array('twosubq', 'fourmc'); + return array('twosubq', 'fourmc', 'numericalzero'); } /** @@ -287,4 +287,48 @@ class qtype_multianswer_test_helper extends question_test_helper { return $q; } + + /** + * Makes a multianswer question with one numerical subquestion, right answer 0. + * This is used for testing the MDL-35370 bug. + * @return qtype_multianswer_question + */ + public function make_multianswer_question_numericalzero() { + question_bank::load_question_definition_classes('multianswer'); + $q = new qtype_multianswer_question(); + test_question_maker::initialise_a_question($q); + $q->name = 'Numerical zero'; + $q->questiontext = + 'Enter zero: {#1}.'; + $q->generalfeedback = ''; + $q->qtype = question_bank::get_qtype('multianswer'); + + $q->textfragments = array( + 'Enter zero: ', + '.', + ); + $q->places = array('1' => '1'); + + // Numerical subquestion. + question_bank::load_question_definition_classes('numerical'); + $sub = new qtype_numerical_question(); + test_question_maker::initialise_a_question($sub); + $sub->name = 'Numerical zero'; + $sub->questiontext = '{1:NUMERICAL:=0:0}'; + $sub->questiontextformat = FORMAT_HTML; + $sub->generalfeedback = ''; + $sub->generalfeedbackformat = FORMAT_HTML; + $sub->answers = array( + 13 => new qtype_numerical_answer(13, '0', 1.0, '', FORMAT_HTML, 0), + ); + $sub->qtype = question_bank::get_qtype('numerical'); + $sub->ap = new qtype_numerical_answer_processor(array()); + $sub->maxmark = 1; + + $q->subquestions = array( + 1 => $sub, + ); + + return $q; + } } diff --git a/question/type/multianswer/tests/walkthrough_test.php b/question/type/multianswer/tests/walkthrough_test.php index 19af3c7..9c9d291 100644 --- a/question/type/multianswer/tests/walkthrough_test.php +++ b/question/type/multianswer/tests/walkthrough_test.php @@ -37,9 +37,15 @@ require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class qtype_multianswer_walkthrough_test extends qbehaviour_walkthrough_test_base { + + protected function get_contains_subq_status(question_state $state) { + return new question_pattern_expectation('~' . + preg_quote($state->default_string(true), '~') . '
    ~'); + } + public function test_deferred_feedback() { - // Create a gapselect question. + // Create a multianswer question. $q = test_question_maker::make_question('multianswer', 'fourmc'); $this->start_attempt_at_question($q, 'deferredfeedback', 4); @@ -86,4 +92,110 @@ class qtype_multianswer_walkthrough_test extends qbehaviour_walkthrough_test_bas $this->get_contains_partcorrect_expectation(), $this->get_does_not_contain_validation_error_expectation()); } + + public function test_deferred_feedback_numericalzero_not_answered() { + // Tests the situation found in MDL-35370. + + // Create a multianswer question with one numerical subquestion, right answer zero. + $q = test_question_maker::make_question('multianswer', 'numericalzero'); + $this->start_attempt_at_question($q, 'deferredfeedback', 1); + + // Check the initial state. + $this->check_current_state(question_state::$todo); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + $this->get_does_not_contain_feedback_expectation(), + $this->get_does_not_contain_validation_error_expectation()); + + // Now submit all and finish. + $this->process_submission(array('-finish' => 1)); + + // Verify. + $this->check_current_state(question_state::$gaveup); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + new question_pattern_expectation('~]* class="incorrect" [^>]*/>~'), + $this->get_contains_subq_status(question_state::$gaveup), + $this->get_does_not_contain_validation_error_expectation()); + } + + public function test_deferred_feedback_numericalzero_0_answer() { + // Tests the situation found in MDL-35370. + + // Create a multianswer question with one numerical subquestion, right answer zero. + $q = test_question_maker::make_question('multianswer', 'numericalzero'); + $this->start_attempt_at_question($q, 'deferredfeedback', 1); + + // Check the initial state. + $this->check_current_state(question_state::$todo); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + $this->get_does_not_contain_feedback_expectation(), + $this->get_does_not_contain_validation_error_expectation()); + + // Save a the correct answer. + $this->process_submission(array('sub1_answer' => '0')); + + // Verify. + $this->check_current_state(question_state::$complete); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + $this->get_does_not_contain_feedback_expectation(), + $this->get_does_not_contain_validation_error_expectation()); + + // Now submit all and finish. + $this->process_submission(array('-finish' => 1)); + + // Verify. + $this->check_current_state(question_state::$gradedright); + $this->check_current_mark(1); + $this->check_current_output( + $this->get_contains_mark_summary(1), + $this->get_contains_correct_expectation(), + $this->get_contains_subq_status(question_state::$gradedright), + $this->get_does_not_contain_validation_error_expectation()); + } + + public function test_deferred_feedback_numericalzero_0_wrong() { + // Tests the situation found in MDL-35370. + + // Create a multianswer question with one numerical subquestion, right answer zero. + $q = test_question_maker::make_question('multianswer', 'numericalzero'); + $this->start_attempt_at_question($q, 'deferredfeedback', 1); + + // Check the initial state. + $this->check_current_state(question_state::$todo); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + $this->get_does_not_contain_feedback_expectation(), + $this->get_does_not_contain_validation_error_expectation()); + + // Save a the correct answer. + $this->process_submission(array('sub1_answer' => '42')); + + // Verify. + $this->check_current_state(question_state::$complete); + $this->check_current_mark(null); + $this->check_current_output( + $this->get_contains_marked_out_of_summary(), + $this->get_does_not_contain_feedback_expectation(), + $this->get_does_not_contain_validation_error_expectation()); + + // Now submit all and finish. + $this->process_submission(array('-finish' => 1)); + + // Verify. + $this->check_current_state(question_state::$gradedwrong); + $this->check_current_mark(0); + $this->check_current_output( + $this->get_contains_mark_summary(0), + $this->get_contains_incorrect_expectation(), + $this->get_contains_subq_status(question_state::$gradedwrong), + $this->get_does_not_contain_validation_error_expectation()); + } } diff --git a/question/type/numerical/question.php b/question/type/numerical/question.php index 110cfdc..0e48155 100644 --- a/question/type/numerical/question.php +++ b/question/type/numerical/question.php @@ -179,6 +179,10 @@ class qtype_numerical_question extends question_graded_automatically { * @return question_answer the matching answer. */ public function get_matching_answer($value, $multiplier) { + if (is_null($value) || $value === '') { + return null; + } + if (!is_null($multiplier)) { $scaledvalue = $value * $multiplier; } else { @@ -193,6 +197,7 @@ class qtype_numerical_question extends question_graded_automatically { return $answer; } } + return null; } @@ -273,18 +278,17 @@ class qtype_numerical_question extends question_graded_automatically { public function check_file_access($qa, $options, $component, $filearea, $args, $forcedownload) { if ($component == 'question' && $filearea == 'answerfeedback') { - $question = $qa->get_question(); $currentanswer = $qa->get_last_qt_var('answer'); if ($this->has_separate_unit_field()) { $selectedunit = $qa->get_last_qt_var('unit'); } else { $selectedunit = null; } - list($value, $unit, $multiplier) = $question->ap->apply_units( + list($value, $unit, $multiplier) = $this->ap->apply_units( $currentanswer, $selectedunit); - $answer = $question->get_matching_answer($value, $multiplier); + $answer = $this->get_matching_answer($value, $multiplier); $answerid = reset($args); // itemid is answer id. - return $options->feedback && $answerid == $answer->id; + return $options->feedback && $answer && $answerid == $answer->id; } else if ($component == 'question' && $filearea == 'hint') { return $this->check_hint_file_access($qa, $options, $args); diff --git a/question/type/numerical/tests/question_test.php b/question/type/numerical/tests/question_test.php index d4ba6f8..84fc7d0 100644 --- a/question/type/numerical/tests/question_test.php +++ b/question/type/numerical/tests/question_test.php @@ -181,6 +181,11 @@ class qtype_numerical_question_test extends advanced_testcase { $this->assertEquals('3.1', $num->summarise_response(array('answer' => '3.1'))); } + public function test_summarise_response_zero() { + $num = test_question_maker::make_question('numerical'); + $this->assertEquals('0', $num->summarise_response(array('answer' => '0'))); + } + public function test_summarise_response_unit() { $num = test_question_maker::make_question('numerical', 'unit'); $this->assertEquals('3.1', $num->summarise_response(array('answer' => '3.1'))); diff --git a/question/type/shortanswer/question.php b/question/type/shortanswer/question.php index a875c8c..72f0f4a 100644 --- a/question/type/shortanswer/question.php +++ b/question/type/shortanswer/question.php @@ -78,6 +78,10 @@ class qtype_shortanswer_question extends question_graded_by_strategy } public function compare_response_with_answer(array $response, question_answer $answer) { + if (!array_key_exists('answer', $response) || is_null($response['answer'])) { + return false; + } + return self::compare_string_with_wildcard( $response['answer'], $answer->answer, !$this->usecase); } @@ -129,7 +133,7 @@ class qtype_shortanswer_question extends question_graded_by_strategy $currentanswer = $qa->get_last_qt_var('answer'); $answer = $qa->get_question()->get_matching_answer(array('answer' => $currentanswer)); $answerid = reset($args); // itemid is answer id. - return $options->feedback && $answerid == $answer->id; + return $options->feedback && $answer && $answerid == $answer->id; } else if ($component == 'question' && $filearea == 'hint') { return $this->check_hint_file_access($qa, $options, $args); diff --git a/question/type/shortanswer/questiontype.php b/question/type/shortanswer/questiontype.php index 31212ce..2cf77d7 100644 --- a/question/type/shortanswer/questiontype.php +++ b/question/type/shortanswer/questiontype.php @@ -117,7 +117,7 @@ class qtype_shortanswer extends question_type { $this->save_hints($question); - // Perform sanity checks on fractional grades + // Perform sanity checks on fractional grades. if ($maxfraction != 1) { $result->noticeyesno = get_string('fractionsnomax', 'question', $maxfraction * 100); return $result; -- 1.7.9.5 From f0f201431682d94e83fe4c5baf35e847e1fb9f30 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Tue, 25 Sep 2012 14:08:59 +0100 Subject: [PATCH 713/903] MDL-35620 question engine: should distinguish NULL and 0. This only matters in an obscure edge case, but it is an edge case we hit with one of the OU question types. This load data code is processing the results of a LEFT JOIN, so is_null is the correct logic. --- question/engine/questionattemptstep.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/question/engine/questionattemptstep.php b/question/engine/questionattemptstep.php index 4cd813a..20a34da 100644 --- a/question/engine/questionattemptstep.php +++ b/question/engine/questionattemptstep.php @@ -386,7 +386,7 @@ class question_attempt_step { $record = $currentrec; $data = array(); while ($currentrec && $currentrec->attemptstepid == $attemptstepid) { - if ($currentrec->name) { + if (!is_null($currentrec->name)) { $data[$currentrec->name] = $currentrec->value; } $records->next(); -- 1.7.9.5 From 022a3555d1f92d4a63bdf159743f604277669243 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 27 Sep 2012 14:13:24 +0100 Subject: [PATCH 714/903] MDL-30885 quiz: use formchangechecker during quiz attempts. To avoid the possiblity of dataloss if a student tries to navigate away having changed some answers. --- mod/quiz/locallib.php | 3 ++- mod/quiz/module.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index f535e9b..fc59804 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -1456,13 +1456,14 @@ function quiz_get_js_module() { 'name' => 'mod_quiz', 'fullpath' => '/mod/quiz/module.js', 'requires' => array('base', 'dom', 'event-delegate', 'event-key', - 'core_question_engine'), + 'core_question_engine', 'moodle-core-formchangechecker'), 'strings' => array( array('cancel', 'moodle'), array('flagged', 'question'), array('functiondisabledbysecuremode', 'quiz'), array('startattempt', 'quiz'), array('timesup', 'quiz'), + array('changesmadereallygoaway', 'moodle'), ), ); } diff --git a/mod/quiz/module.js b/mod/quiz/module.js index 89fa16a..ce0d359 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -27,6 +27,7 @@ M.mod_quiz = M.mod_quiz || {}; M.mod_quiz.init_attempt_form = function(Y) { M.core_question_engine.init_form(Y, '#responseform'); Y.on('submit', M.mod_quiz.timer.stop, '#responseform'); + M.core_formchangechecker.init({formid: 'responseform'}); }; M.mod_quiz.init_review_form = function(Y) { -- 1.7.9.5 From 40d651bbbb20b4373b6b56e4e09c90b30ff86484 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 27 Sep 2012 18:57:51 +0100 Subject: [PATCH 715/903] MDL-34894 course ws unit tests: fix windows problem. This fixes a weird windows-only failure, as explained in the tracker issue. --- course/tests/externallib_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php index 984b9ed..605c5d8 100644 --- a/course/tests/externallib_test.php +++ b/course/tests/externallib_test.php @@ -580,5 +580,6 @@ class core_course_external_testcase extends externallib_advanced_testcase { // Check that the course has been duplicated. $this->assertEquals($newcourse['shortname'], $duplicate['shortname']); + gc_collect_cycles(); } } -- 1.7.9.5 From 28c93484058f9397efa337e1f47c4c1daeea59a1 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 27 Sep 2012 19:03:34 +0100 Subject: [PATCH 716/903] MDL-35680 user selector: more usable when queries are slow. The problem is to do when you pause a bit, so a search starts, and then type a bit more before the search finishes. It was behaving like this: 1. Type a bit, then pause. 2. First search request sent. 3. Type a bit more, then pause. 4. Second search request sent. 5. First search request completes. 6. You try to select one result. 7. Second search request comples, overwriting what you are selecting. This fix works by cancelling the first request before sending the second. --- user/selector/module.js | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/user/selector/module.js b/user/selector/module.js index 68b743d..de2f500 100644 --- a/user/selector/module.js +++ b/user/selector/module.js @@ -43,6 +43,8 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc listbox : Y.one('#'+name), /** Used to hold the timeout id of the timeout that waits before doing a search. */ timeoutid : null, + /** Stores any in-progress remote requests. */ + iotransactions : {}, /** The last string that we searched for, so we can avoid unnecessary repeat searches. */ lastsearch : lastsearch, /** Whether any options where selected last time we checked. Used by @@ -140,7 +142,12 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc return; } - Y.io(M.cfg.wwwroot + '/user/selector/search.php', { + // Try to cancel existing transactions. + Y.Object.each(this.iotransactions, function(trans) { + trans.abort(); + }); + + var iotrans = Y.io(M.cfg.wwwroot + '/user/selector/search.php', { method: 'POST', data: 'selectorid='+hash+'&sesskey='+M.cfg.sesskey+'&search='+value + '&userselector_searchanywhere=' + this.get_option('searchanywhere'), on: { @@ -149,6 +156,7 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc }, context:this }); + this.iotransactions[iotrans.id] = iotrans; this.lastsearch = value; this.listbox.setStyle('background','url(' + M.util.image_url('i/loading', 'moodle') + ') no-repeat center center'); @@ -160,17 +168,27 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc */ handle_response : function(requestid, response) { try { + delete this.iotransactions[requestid]; + if (!Y.Object.isEmpty(this.iotransactions)) { + // More searches pending. Wait until they are all done. + return; + } this.listbox.setStyle('background',''); var data = Y.JSON.parse(response.responseText); this.output_options(data); } catch (e) { - this.handle_failure(); + this.handle_failure(requestid); } }, /** * Handles what happens when the ajax request fails. */ - handle_failure : function() { + handle_failure : function(requestid) { + delete this.iotransactions[requestid]; + if (!Y.Object.isEmpty(this.iotransactions)) { + // More searches pending. Wait until they are all done. + return; + } this.listbox.setStyle('background',''); this.searchfield.addClass('error'); -- 1.7.9.5 From 860c7e82bd45d068a15827875c790bf7da2e0b89 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 18 Sep 2012 13:07:01 +1200 Subject: [PATCH 717/903] MDL-35227 SCORM: set completion in correct location. --- mod/scorm/lib.php | 56 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index c587b68..27b4722 100644 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -150,7 +150,7 @@ function scorm_add_instance($scorm, $mform=null) { scorm_parse($record, true); - scorm_grade_item_update($record, null, false); + scorm_grade_item_update($record); return $record->id; } @@ -591,18 +591,21 @@ function scorm_get_user_grades($scorm, $userid=0) { * @param bool $nullifnone */ function scorm_update_grades($scorm, $userid=0, $nullifnone=true) { - global $CFG, $DB; + global $CFG; require_once($CFG->libdir.'/gradelib.php'); + require_once($CFG->libdir.'/completionlib.php'); if ($grades = scorm_get_user_grades($scorm, $userid)) { scorm_grade_item_update($scorm, $grades); - + //set complete + scorm_set_completion($scorm, $userid, COMPLETION_COMPLETE, $grades); } else if ($userid and $nullifnone) { $grade = new stdClass(); $grade->userid = $userid; $grade->rawgrade = null; scorm_grade_item_update($scorm, $grade); - + //set incomplete. + scorm_set_completion($scorm, $userid, COMPLETION_INCOMPLETE); } else { scorm_grade_item_update($scorm); } @@ -646,10 +649,9 @@ function scorm_upgrade_grades() { * @uses GRADE_TYPE_NONE * @param object $scorm object with extra cmidnumber * @param mixed $grades optional array/object of grade(s); 'reset' means reset grades in gradebook - * @param boolean $updatecompletion set whether to update completion stuff * @return object grade_item */ -function scorm_grade_item_update($scorm, $grades=null, $updatecompletion=true) { +function scorm_grade_item_update($scorm, $grades=null) { global $CFG, $DB; require_once($CFG->dirroot.'/mod/scorm/locallib.php'); if (!function_exists('grade_update')) { //workaround for buggy PHP versions @@ -680,19 +682,6 @@ function scorm_grade_item_update($scorm, $grades=null, $updatecompletion=true) { $grades = null; } - // Update activity completion if applicable - if ($updatecompletion) { - // Get course info - $course = new stdClass(); - $course->id = $scorm->course; - - $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id); - if (!empty($cm)) { - $completion = new completion_info($course); - $completion->update_state($cm, COMPLETION_COMPLETE); - } - } - return grade_update('mod/scorm', $scorm->course, 'mod', 'scorm', $scorm->id, 0, $grades, $params); } @@ -1329,3 +1318,32 @@ function scorm_dndupload_handle($uploadinfo) { return scorm_add_instance($scorm, null); } + +/** + * Sets activity completion state + * + * @param object $scorm object + * @param int $userid User ID + * @param int $completionstate Completion state + * @param array $grades grades array of users with grades - used when $userid = 0 + */ +function scorm_set_completion($scorm, $userid, $completionstate = COMPLETION_COMPLETE, $grades = array()) { + if (!completion_info::is_enabled()) { + return; + } + + $course = new stdClass(); + $course->id = $scorm->course; + + $cm = get_coursemodule_from_instance('scorm', $scorm->id, $scorm->course); + if (!empty($cm)) { + $completion = new completion_info($course); + if (empty($userid)) { //we need to get all the relevant users from $grades param. + foreach ($grades as $grade) { + $completion->update_state($cm, $completionstate, $grade->userid); + } + } else { + $completion->update_state($cm, $completionstate, $userid); + } + } +} -- 1.7.9.5 From add494f1afb2ee00240235b086c0d89585621baa Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 21 Sep 2012 13:41:43 +1200 Subject: [PATCH 718/903] MDL-35557 enrol/database: use distinct call when getting list of courses that should be added. --- enrol/database/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enrol/database/lib.php b/enrol/database/lib.php index 1755a89..b5beeba 100644 --- a/enrol/database/lib.php +++ b/enrol/database/lib.php @@ -630,7 +630,7 @@ class enrol_database_plugin extends enrol_plugin { if ($idnumber) { $sqlfields[] = $idnumber; } - $sql = $this->db_get_sql($table, array(), $sqlfields); + $sql = $this->db_get_sql($table, array(), $sqlfields, true); $createcourses = array(); if ($rs = $extdb->Execute($sql)) { if (!$rs->EOF) { -- 1.7.9.5 From 31fabbdbaa3922ef96ed33c71e053f23d4563183 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 21 Sep 2012 21:52:42 +1200 Subject: [PATCH 719/903] MDL-35562 enrol_database: enrolment_sync - don't halt sync on failed search for course. --- enrol/database/lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/enrol/database/lib.php b/enrol/database/lib.php index 1755a89..0109866 100644 --- a/enrol/database/lib.php +++ b/enrol/database/lib.php @@ -481,9 +481,8 @@ class enrol_database_plugin extends enrol_plugin { } $rs->Close(); } else { - mtrace('Error while communicating with external enrolment database'); - $extdb->Close(); - return; + mtrace(" error: skipping course '$course->mapping' - could not match with external database"); + continue; } unset($user_mapping); -- 1.7.9.5 From 14a695f6077a2fc9fe6b36143eb6ecfae0ef230a Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Fri, 28 Sep 2012 02:18:48 +0100 Subject: [PATCH 720/903] MDL-35654 theme_anomaly: Added custom menu renderer to aid RTL styling of menu --- theme/anomaly/config.php | 2 +- theme/anomaly/pix/menu/nav-arrow-left.jpg | Bin 0 -> 461 bytes theme/anomaly/pix/menu/nav-arrow-right.jpg | Bin 0 -> 460 bytes theme/anomaly/pix/menu/nav-arrowover-left.jpg | Bin 0 -> 437 bytes theme/anomaly/pix/menu/nav-arrowover-right.jpg | Bin 0 -> 440 bytes theme/anomaly/renderers.php | 85 +++++++++ theme/anomaly/style/general.css | 158 ----------------- theme/anomaly/style/menu.css | 221 ++++++++++++++++++++++++ 8 files changed, 307 insertions(+), 159 deletions(-) create mode 100644 theme/anomaly/pix/menu/nav-arrow-left.jpg create mode 100644 theme/anomaly/pix/menu/nav-arrow-right.jpg create mode 100644 theme/anomaly/pix/menu/nav-arrowover-left.jpg create mode 100644 theme/anomaly/pix/menu/nav-arrowover-right.jpg create mode 100644 theme/anomaly/style/menu.css diff --git a/theme/anomaly/config.php b/theme/anomaly/config.php index 1f32394..d435a8d 100644 --- a/theme/anomaly/config.php +++ b/theme/anomaly/config.php @@ -7,7 +7,7 @@ $THEME->name = 'anomaly'; -$THEME->sheets = array('base', 'general', 'browser','dock'); +$THEME->sheets = array('base', 'general', 'browser', 'dock', 'menu'); /// This variable is an array containing the names of all the /// stylesheet files you want included in this theme, and in what order //////////////////////////////////////////////////////////////////////////////// diff --git a/theme/anomaly/pix/menu/nav-arrow-left.jpg b/theme/anomaly/pix/menu/nav-arrow-left.jpg new file mode 100644 index 0000000000000000000000000000000000000000..177f823a0a3a1e73e4846d183d14ec5b1dc5fc78 GIT binary patch literal 461 zcmex=vGczkfj**Fh zg;kK5ja^7s(J{~vs74G!FHi+gTtpC|3u^NJTMRtRj6i#t1sUua9&Z#hyfjgeQBXio zkWtIxc1rB_vp=HOp1!sG^5M{{yPj%Z_-!BY;LG|w@&`DDJ}vIuzV~)=eCx40cW>4D z=*B8<6I#f=_+y*Dch$+iEKO2HZ`vGYbmRdUIrFcpty)2s);}&{@-HYVP*u{%Ph!X&(PPvQ?dYTFr&wZ z{|x4=9n~Hu`I%U?T9!#`c!s4Qd5C1bLL}%#mEnTys z+S2-bl$c4%e747*KFzuH>-dx^|MFelc~6>~&nA76h*^6~TRS`G(zjbRT9;wsX literal 0 HcmV?d00001 diff --git a/theme/anomaly/pix/menu/nav-arrowover-left.jpg b/theme/anomaly/pix/menu/nav-arrowover-left.jpg new file mode 100644 index 0000000000000000000000000000000000000000..596b6ff366dac22ec6974758b9c973c56865adb7 GIT binary patch literal 437 zcmex=vGcyY_LW+@@ ziA9lBP?(Kf$j~wHAW)GQhGqt^W>G;jGZ`2d|KDQZVP*u{%q+-Y&+v?a$Hf6`G-K-R zbCcRvZCRUTs?Ym&J8#$~vp?lEvo8nzs@C}(tv+YDRAkxb)rl`-wWB7wo~has_children()) { + return ''; + } + + // Add a login or logout link + if (isloggedin()) { + $branchlabel = get_string('logout'); + $branchurl = new moodle_url('/login/logout.php'); + } else { + $branchlabel = get_string('login'); + $branchurl = new moodle_url('/login/index.php'); + } + $branch = $menu->add($branchlabel, $branchurl, $branchlabel, -1); + + // Initialise this custom menu + $content = html_writer::start_tag('ul', array('class'=>'dropdown dropdown-horizontal')); + // Render each child + foreach ($menu->get_children() as $item) { + $content .= $this->render_custom_menu_item($item); + } + // Close the open tags + $content .= html_writer::end_tag('ul'); + // Return the custom menu + return $content; + } + + /** + * Renders a custom menu node as part of a submenu + * + * The custom menu this method override the render_custom_menu_item function + * in outputrenderers.php + * + * @see render_custom_menu() + * + * @staticvar int $submenucount + * @param custom_menu_item $menunode + * @return string + */ + protected function render_custom_menu_item(custom_menu_item $menunode) { + // Required to ensure we get unique trackable id's + static $submenucount = 0; + $content = html_writer::start_tag('li'); + if ($menunode->has_children()) { + // If the child has menus render it as a sub menu + $submenucount++; + if ($menunode->get_url() !== null) { + $url = $menunode->get_url(); + } else { + $url = '#cm_submenu_'.$submenucount; + } + $content .= html_writer::start_tag('span', array('class'=>'customitem')); + $content .= html_writer::link($url, $menunode->get_text(), array('title'=>$menunode->get_title())); + $content .= html_writer::end_tag('span'); + $content .= html_writer::start_tag('ul'); + foreach ($menunode->get_children() as $menunode) { + $content .= $this->render_custom_menu_item($menunode); + } + $content .= html_writer::end_tag('ul'); + } else { + // The node doesn't have children so produce a final menuitem + + if ($menunode->get_url() !== null) { + $url = $menunode->get_url(); + } else { + $url = '#'; + } + $content .= html_writer::link($url, $menunode->get_text(), array('title'=>$menunode->get_title())); + } + $content .= html_writer::end_tag('li'); + // Return the sub menu + return $content; + } + } \ No newline at end of file diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css index d695186..cfc2ecf 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -11,21 +11,17 @@ a:visited { a:hover { text-decoration: underline; } - img.icon, img.iconhelp { vertical-align: middle; } - html, body { background-color: #C8C9C7; } - #page-content { background-color: #FFF; min-width: 0; } - /** Header **/ #page-header { @@ -36,14 +32,12 @@ html, body { padding: 0; width: 100%; } - h1.headermain { float: left; font-size: 2.3em; margin: 15px; line-height: 1; } - #page-header .headermain span { color: #C8C9C7; } @@ -54,7 +48,6 @@ h1.headermain { border-bottom-color: #3A4D28; border-bottom-width: 3px; } - #page-header .navbar { background-color: #697F55; width: 100%; @@ -96,7 +89,6 @@ h1.headermain { background-color: #E3E3E3; padding: 4px 5px; } - .coursebox { width: 100%; margin: 10px 0; @@ -120,55 +112,44 @@ h1.headermain { .course-content .headingblock.outline { margin-top: 0; } - .course-content .section.main { border:1px solid #E3E3E3; margin-bottom: 10px; } - .course-content .section.main .left.side { float:left;width:20px;padding:5px; } - .course-content .section.main .right.side { float: right; width: 20px; padding: 5px; } - .course-content .section.main .content { padding: 5px 5px 10px; background-color: #FFF; } - .course-content .section.main .content .section_add_menus { text-align: right; } - #page-report-outline-user .section { border: 1px solid #DDD; margin: 0 5% 1.5em 5%; } - #page-report-outline-user .section h2, #page-report-outline-user .section .content { margin: 5px 1em; } - #page-report-outline-user .section table td { border: 0; } - .generaltable { border: 1px solid #DDD; } - .generaltable .cell { background-color: #FFF; border:1px solid #EEE; border-collapse: collapse; } - .generaltable .header { background-color: #EEE; border: 1px solid #EEE; @@ -180,17 +161,14 @@ h1.headermain { margin-top: 15px; margin-bottom: 15px; } - .loginbox .loginform { margin-top: 15px; } - .loginbox .loginform .form-label { width: 44%; float: left; text-align: right; } - .loginbox .loginform .form-input { width: 55%; float: right; @@ -200,42 +178,34 @@ h1.headermain { .loginbox .loginform .form-input input { width: 6em; } - .loginbox.twocolumns { border: 1px solid #DDD; } - .loginbox.twocolumns .loginpanel { float: left; width: 49%; text-align: center; } - .loginbox.twocolumns .signuppanel { float: left; width: 50%; border-left: 1px solid #DDD; } - .loginbox.twocolumns .signuppanel h2 { text-align: center; } - .loginbox.twocolumns .signuppanel div { margin: 1em; } - .loginbox.twocolumns .signuppanel div li { font-size: 90%; } - .loginbox .loginsub { margin-left: 10%; margin-right: 10%; padding: 10px; margin-bottom: 5px; } - .loginbox .guestsub { margin-left: 10%; margin-right: 10%; @@ -243,7 +213,6 @@ h1.headermain { margin-bottom: 5px; border-top: 1px solid #DDD; } - .dir-rtl .loginbox .loginform .form-input {width:50%} /** Blocks **/ @@ -260,15 +229,12 @@ h1.headermain { .block h4 { margin: 0; } - .block .header { margin: 10px 6px 3px 6px; } - .block .content { margin: 10px 6px 3px 6px; } - /** Admin **/ .box.adminwarning { text-align: center; @@ -282,62 +248,50 @@ h1.headermain { font-size: 90%; padding: 10px 10%; } - #adminsettings fieldset { border: 1px solid #C8C9C7; background-color: #E3E3E3; } - #adminsettings fieldset .generalbox { margin: 1em 0.5em; border-color: #C8C9C7; } - #adminsettings .form-buttons { margin-left: 13em; } - .form-item { width: 100%; margin: 1em 1em 2em 1em; } - .form-item .form-label { width: 12.5em; text-align: right; float: left; margin-right: 0.5em; } - .form-item .form-label .form-shortname { display: block; color: #666; font-size: 75%; } - .form-item .form-setting { margin-left: 13em; } - .form-item .form-setting .defaultsnext { display:inline; } - .form-item .form-setting .form-defaultinfo { display: inline; margin-left: 0.5em; font-size: 90%; color: #666; } - .form-item .form-description { margin: 0.5em 1em 0.5em 13em; } - .form-item .form-textarea textarea { width: 495px; } - #authmenu .informationbox { width: 80%; margin: 0 auto 10px; @@ -347,13 +301,11 @@ h1.headermain { #authmenu table td { border-width: 0; } - #categoryquestions { margin-left: auto; margin-right: auto; width: 100%; } - #categoryquestions th, .user th, .user th.header, @@ -365,7 +317,6 @@ h1.headermain { border: 2px solid #697F55; border-bottom-color: #111; } - .user th a:link, #categoryquestions th a:link, .group th a:link, @@ -373,7 +324,6 @@ h1.headermain { color: #FFF; text-decoration: none; } - .user th a:visited, #categoryquestions th a:visited, .group th a:visited, @@ -381,7 +331,6 @@ h1.headermain { color: #FFF; text-decoration: underline; } - .user tr td.cell, #categoryquestions tr td.cell, .group tr td.cell, @@ -389,39 +338,32 @@ h1.headermain { border: 1px solid #C8C9C7; border-width: 0 1px; } - .user .r1 .cell, #categoryquestions .r1 .cell, .group .r1 .cell, .admin table .r1 .cell { background-color: #EEE; } - .singlebutton, .buttons { text-align: center; margin: 20px; } - .buttons form { display: inline; } - .buttons div { display: inline; } - .buttons .singlebutton { display: inline; padding: 5px; margin: 0; } - .admin .generalbox { background-color: #EEE; border-color: #C8C9C7; } - #admin-mnet-index table td, #files-index .column-content table td { border-width: 0; @@ -436,7 +378,6 @@ h1.headermain { .tag-management-form { text-align:center; } - #tag-management-list { margin-top:1em; } @@ -446,12 +387,10 @@ h1.headermain { border-width: 0; vertical-align: top; } - .userinfobox .side { width: 120px; text-align: center; } - .userinfobox .list .label {font-weight:bold;text-align:right; } @@ -463,7 +402,6 @@ h1.headermain { border: 1px solid #DDD; border-collapse: separate; } - .forumpost, .forumpost .left.picture { background-color: #EEE; @@ -484,13 +422,11 @@ h1.headermain { .forumpost .topic .author { padding-left: 10px; } - .forumpost .content, .forumpost .options { background-color: white; padding-top: 10px; } - .forumpost .content .shortenedpost a { margin: 0 10px; padding: 0; @@ -505,7 +441,6 @@ h1.headermain { .forumpost .options .link { padding-right: 10px; } - .forumpost .content .shortenedpost a, .forumpost .content .shortenedpost span.post-word-count, .forumpost .commands, @@ -517,13 +452,11 @@ h1.headermain { .forumpost .row .left { clear: left; } - .forumpost .posting.shortenedpost {margin-left: 10px;} #page-mod-forum-discuss #page-header { /* fixes broken header in forum discuss */ margin-top: 10px; } - /** Calendar **/ .block.block_calendar_month td, .block.block_calendar_month th { @@ -533,12 +466,10 @@ h1.headermain { width: 14%; line-height: 18px; } - #calendar abbr, .block.block_calendar_month abbr { border-bottom-width: 0; } - #calendar .weekend, .block.block_calendar_month .weekend { color: #A00; @@ -547,19 +478,16 @@ h1.headermain { .block.block_calendar_month .today { border: 1px solid #444; } - #calendar .eventnone a, .block.block_calendar_month .eventnone a { color:#444; } - #calendar { width: 98%; margin: 0 1%; border-spacing: 5px; border-collapse: separate; } - #calendar td, #calendar th { border-width: 0; @@ -569,43 +497,35 @@ h1.headermain { line-height: 18px; vertical-align: top; } - #calendar .maincalendar { width: auto; border: 1px solid #DDD; } - #calendar .maincalendar .heightcontainer { height: 100%; position: relative; margin: 1em; } - #calendar .maincalendar .header { padding: 5px; font-weight: bold; } - #calendar .maincalendar .header .buttons { float: right; } - #calendar .maincalendar table { width: 100%; } - #calendar .maincalendar .calendar-controls { width: 100%; overflow: hidden; font-size: 1.1em; } - #calendar .maincalendar .calendar-controls .previous { display: block; float: left; width: 20%; } - #calendar .maincalendar .calendar-controls .current { display: block; float: left; @@ -613,43 +533,35 @@ h1.headermain { text-align: center; margin-top: 0; } - #calendar .maincalendar .calendar-controls .next { display: block; float: left; width: 20%; text-align: right; } - #calendar .sidecalendar { width: 200px; } - #calendar .sidecalendar h2, #calendar .sidecalendar h3 { margin: 5px; font-size: 95%; } - #calendar .sidecalendar .block { border: 1px solid #DDD; margin-bottom: 10px; text-align: center; } - #calendar .sidecalendar .block table { margin: 0 auto 5px; } - #calendar .sidecalendar .block .filters table { width: 95%; margin: 0 auto 1em; } - #calendar .sidecalendar .block .minicalendarblock { border-top: 1px solid #DDD; } - #calendar .filters table { padding: 2px; background-color: #EEE; @@ -657,7 +569,6 @@ h1.headermain { border-spacing: 2px; border-collapse: separate; } - #calendar .filters table td { font-size: 100%; width: auto; @@ -667,91 +578,73 @@ h1.headermain { border: 1px solid #444; overflow: hidden; } - #calendar .calendar_event_global { background-color: #D6F8CD; } - #calendar .calendar_event_course { background-color: #FFD3BD; } - #calendar .calendar_event_group { background-color: #FEE7AE; } - #calendar .calendar_event_user { background-color: #DCE7EC; } - #calendar .maincalendar .calendarmonth { border-collapse: separate; } - #calendar .maincalendar .calendarmonth th { font-size: 0.9em; border-bottom: 2px solid #444; } - #calendar .maincalendar .calendarmonth td { border: 1px solid #EEE; border-bottom-color: #CCC; border-right-color: #CCC; height: 6em; } - #calendar .maincalendar .calendarmonth td div {margin:4px;font-size:0.9em; } #calendar .maincalendar .calendarmonth td .day {font-weight:bold; } - #calendar .maincalendar .calendarmonth tr td:first-child { border-left-color: #CCC; } - #calendar .maincalendar .event { border-spacing: 0; border: 1px solid #DDD; background-color: #EEE; } - #calendar .maincalendar .event .picture { width: 32px; text-align: center; } - #calendar .maincalendar .event .topic { width: auto; padding: 5px; } - #calendar .maincalendar .event .side { width: 32px; } - #calendar .maincalendar .event .description { width: auto; border-top: 1px solid #DDD; border-left:1px solid #DDD; padding: 5px; } - #calendar .maincalendar .bottom { text-align: center; } - #calendar .calendarmonth ul { margin: 0; padding: 0; } - #calendar .calendarmonth ul li { list-style: none; margin: 0; padding: 2px; } - /** User **/ .user .rolesform, @@ -760,14 +653,11 @@ h1.headermain { .user #participantsform { text-align:center; } - .user #participantsform table { margin-top:1em; } - .user #participantsform td {text-align:left; } - .user table.controls { margin: 5px auto; border: 1px solid #DDD; @@ -777,7 +667,6 @@ h1.headermain { .user table.controls td { border-width:0px; } - /** Overide for RTL layout **/ .dir-rtl #page-header .navbar .breadcrumb { @@ -787,53 +676,6 @@ h1.headermain { float:left; } -/** Custom menu **/ - -#custommenu { - margin-bottom: 0; -} - -#custommenu .yui3-menu-horizontal .yui3-menu-content, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content, -#custommenu .yui3-menu-horizontal .yui3-menu-content ul, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul, -#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content li li:hover > a, -#custommenu .yui3-menu-horizontal .yui3-menu-label, -#custommenu .yui3-menuitem, -#custommenu .yui3-menuitem .yui3-menuitem-content { - border-width: 0; -} - -#custommenu .yui3-menu .yui3-menu-label, -#custommenu .yui3-menu .yui3-menuitem-content { - color: #FFF; - font-weight: bold; - line-height: 30px; - padding: 0 14px; -} - -#custommenu .custom_menu_submenu .yui3-menu-content{ - background-color: #3A4D28; -} - -#custommenu .yui3-menuitem-active .yui3-menuitem-content { - background-image: none; -} - -#custommenu .custom_menu_submenu .yui3-menu-label, -#custommenu .custom_menu_submenu .yui3-menuitem-content { - line-height: 25px; - padding: 0 20px; -} - -#custommenu .yui3-menu-label-active, -#custommenu .yui3-menu-label-menuvisible, -#custommenu .yui3-menuitem-active .yui3-menuitem-content, -#custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content, -#custommenu .yui3-menu-horizontal.javascript-disabled li a:hover { - background-color: #697F55; -} - /* Add Block -------------------------*/ .block .content .singleselect form#add_block .select.menubui_addblock { width: 160px;} diff --git a/theme/anomaly/style/menu.css b/theme/anomaly/style/menu.css new file mode 100644 index 0000000..09a8c14 --- /dev/null +++ b/theme/anomaly/style/menu.css @@ -0,0 +1,221 @@ +/* Custom menu, in LTR mode +--------------------------*/ +#custommenu { + width: 100%; + margin: 0; + padding: 0; + clear: both; + height: 30px; + background: #222; + margin:0; +} +/* +Dropdown Menu - CSS from DeCaf Theme by Lei Zhang +-------------------------------------------------*/ +ul.dropdown span.customitem { + padding: 0; + border: 0; + width: 100%; +} +ul.dropdown span.customitem { + padding: 0; + width: 100%; +} +ul.dropdown li a, +ul.dropdown span.customitem a { + padding: 6px 20px; +} +ul.dropdown span.customitem a:hover { + border: 0; +} +#custommenu ul.dropdown ul { + padding:0; + width: auto; +} +#custommenu ul.dropdown ul a { + padding: 4px 18px; +} +#custommenu ul.dropdown > li span a { + height: 16px; +} +ul.dropdown, +ul.dropdown li, +ul.dropdown ul { + list-style: none; + margin: 0; + padding: 0; +} +ul.dropdown { + position:relative; + top: 0; + z-index: 597; + float:left; + font-size: 13px; +} +ul.dropdown li { + float: left; + line-height: 1.3em; + vertical-align: middle; + background-color: transparent; + color: #FFF; + zoom: 1; +} +ul.dropdown li.hover, +ul.dropdown li:hover { + position: relative; + z-index: 599; + cursor: default; +} +ul.dropdown ul { + visibility: hidden; + position: absolute; + top: 100%; + z-index: 598; + left: 0; + right: auto; + margin-top: -1px; /** this setting is important do not change **/ + font-size: 100%; +} +ul.dropdown ul li { + float:none; + background-color: #3A4D28; + border-width: 1px; + border-style: solid; + border-color: #3A4D28 #697F55 #5A6D49; /** menu item border **/ + padding: 0; +} +ul.dropdown ul ul { + top: 0; + right: auto; + left: 100%; + margin-top: 0; + border-top: none; + border-left: none; + font-weight: 400; +} +ul.dropdown li:hover > ul { + visibility: visible; +} +ul.dropdown span, +ul.dropdown span a, +ul.dropdown li.clickable-with-children > a { + width: auto; + padding: 2px 6px 4px 20px; + color: #FFF; +} +ul.dropdown ul span, +ul.dropdown ul span a, +ul.dropdown ul li.clickable-with-children > a { + background-color: #3A4D28; + background-image: url([[pix:theme|menu/nav-arrow-right]]); + background-position: 100% 50%; + background-repeat: no-repeat; + color: #FFF; +} +ul.dropdown ul ul span, +ul.dropdown ul ul span a, +ul.dropdown ul ul li.clickable-with-children > a { + background-color: #3A4D28; + background-image: url([[pix:theme|menu/nav-arrow-right]]); + background-position: 100% 50%; + background-repeat: no-repeat; + color: #FFF; +} +ul.dropdown a:link, +ul.dropdown a:visited { + color: white; + text-decoration: none; +} +ul.dropdown a:hover { + border: 0 none; + background-color: #697F55; + color: #FFF; +} +ul.dropdown ul ul li { + background-color: #3A4D28; +} +ul.dropdown ul ul ul li { + background-color: #3A4D28; +} +ul.dropdown li a, +ul.dropdown span, +ul.dropdown span a { + border: 0 none; +} +ul.dropdown ul li a, +ul.dropdown ul span, +ul.dropdown ul span a { + border: 0; +} +ul.dropdown ul ul li a, +ul.dropdown ul ul span, +ul.dropdown ul ul span a { + border: 0 none; +} +ul.dropdown ul ul ul li a, +ul.dropdown ul ul ul span, +ul.dropdown ul ul ul span a { + border: 0 none; +} +ul.dropdown a, +ul.dropdown span { + display: block; +} +ul.dropdown ul a { + width: 166px; + padding: 2px 0 4px 5px; +} +ul.dropdown ul a.open:hover { + background-color: #697F55; + color: #FFF; +} +ul.dropdown ul li:hover > span, +ul.dropdown ul li:hover > span a { + background-color: #697F55; + background-image:url([[pix:theme|menu/nav-arrowover-right]]); + color: #FFF; +} +ul.dropdown li.clickable-with-children:hover > a { + background-image:url([[pix:theme|menu/nav-arrowover-right]]); +} +ul.dropdown *.open, +ul.dropdown li:hover > span, +ul.dropdown li:hover > span a { + background-color: #697F55; + color: #FFF; +} +ul.dropdown ul ul *.open, +ul.dropdown ul ul li:hover > span, +ul.dropdown ul ul li:hover > span a { + background-color: #697F55; + background-image: url([[pix:theme|menu/nav-arrowover-right]]); + color: #FFF; +} + +/* Custom menu, in RTL mode +---------------------------*/ +.dir-rtl #custommenu ul.dropdown { + float: right; +} +.dir-rtl #custommenu ul.dropdown ul{ + right: 0; + left: auto; +} +.dir-rtl #custommenu ul.dropdown ul ul { + right: 203px; + left: auto; +} +.dir-rtl #custommenu ul.dropdown ul span, +.dir-rtl #custommenu ul.dropdown ul span a, +.dir-rtl #custommenu ul.dropdown ul li.clickable-with-children > a { + background-image: url([[pix:theme|menu/nav-arrow-left]]); + background-position: 0 50%; + background-repeat: no-repeat; +} +.dir-rtl #custommenu ul.dropdown ul li:hover > span, +.dir-rtl #custommenu ul.dropdown ul li:hover > span a { + background-image: url([[pix:theme|menu/nav-arrowover-left]]); +} +.dir-rtl #custommenu ul.dropdown li.clickable-with-children:hover > a { + background-image: url([[pix:theme|menu/nav-arrowover-left]]); +} -- 1.7.9.5 From 7765e94f5edb3e305c7e9aedad54ca43e9cc3a9f Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 18 Sep 2012 13:41:11 +0800 Subject: [PATCH 721/903] MDL-34931 core_grade: Fixed grades hidden when activity is hidden --- grade/report/user/lib.php | 24 +++++++++++++----------- lib/modinfolib.php | 20 +++++++++++++++++--- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index 915aefd..cd2e951 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -341,23 +341,25 @@ class grade_report_user extends grade_report { $hidden = ' hidden'; } + $hide = false; // If this is a hidden grade item, hide it completely from the user. if ($grade_grade->is_hidden() && !$this->canviewhidden && ( $this->showhiddenitems == GRADE_REPORT_USER_HIDE_HIDDEN || ($this->showhiddenitems == GRADE_REPORT_USER_HIDE_UNTIL && !$grade_grade->is_hiddenuntil()))) { - // return false; - } else { - // The grade object can be marked visible but still be hidden - // if "enablegroupmembersonly" is on and its an activity assigned to a grouping the user is not in - if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) { - $instances = $this->gtree->modinfo->get_instances(); - if (!empty($instances[$grade_object->itemmodule][$grade_object->iteminstance])) { - $cm = $instances[$grade_object->itemmodule][$grade_object->iteminstance]; - if (!$cm->uservisible) { - return false; - } + $hide = true; + } else if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) { + // The grade object can be marked visible but still be hidden if "enablegroupmembersonly" + // is on and it's an activity assigned to a grouping the user is not in. + $instances = $this->gtree->modinfo->get_instances_of($grade_object->itemmodule); + if (!empty($instances[$grade_object->iteminstance])) { + $cm = $instances[$grade_object->iteminstance]; + if ($cm->is_user_access_restricted_by_group()) { + $hide = true; } } + } + + if (!$hide) { /// Excluded Item if ($grade_grade->is_excluded()) { $fullname .= ' ['.get_string('excluded', 'grades').']'; diff --git a/lib/modinfolib.php b/lib/modinfolib.php index 0739f76..c787896 100644 --- a/lib/modinfolib.php +++ b/lib/modinfolib.php @@ -1095,17 +1095,31 @@ class cm_info extends stdClass { } // Check group membership. The grouping option makes the activity // completely invisible as it does not apply to the user at all. + if ($this->is_user_access_restricted_by_group()) { + $this->uservisible = false; + // Ensure activity is completely hidden from user. + $this->showavailability = 0; + } + } + + /** + * Checks whether the module group settings restrict the user access. + * @return bool true if the user access is restricted + */ + public function is_user_access_restricted_by_group() { + global $CFG; + $modcontext = context_module::instance($this->id); + $userid = $this->modinfo->get_user_id(); if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly) and !has_capability('moodle/site:accessallgroups', $modcontext, $userid)) { // If the activity has 'group members only' and you don't have accessallgroups... $groups = $this->modinfo->get_groups($this->groupingid); if (empty($groups)) { // ...and you don't belong to a group, then set it so you can't see/access it - $this->uservisible = false; - // Ensure activity is completely hidden from user. - $this->showavailability = 0; + return true; } } + return false; } /** -- 1.7.9.5 From daa3c5ff1b8dfafb494d41c7b8357a5aeea1a650 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Tue, 31 Jul 2012 17:40:06 +0800 Subject: [PATCH 722/903] MDL-34570 accessibility compliance for question: edit string label --- question/behaviour/rendererbase.php | 3 ++- question/format/xhtml/format.php | 9 ++++++--- question/format/xhtml/lang/en/qformat_xhtml.php | 1 + .../type/calculated/lang/en/qtype_calculated.php | 2 ++ question/type/calculated/questiontype.php | 6 ++++-- question/type/essay/lang/en/qtype_essay.php | 1 + question/type/essay/renderer.php | 3 ++- question/type/match/lang/en/qtype_match.php | 1 + question/type/match/renderer.php | 1 + question/type/multianswer/renderer.php | 6 +++--- question/type/numerical/renderer.php | 7 +++++-- question/type/shortanswer/renderer.php | 4 ++-- 12 files changed, 30 insertions(+), 14 deletions(-) diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php index adf9363..78de4db 100644 --- a/question/behaviour/rendererbase.php +++ b/question/behaviour/rendererbase.php @@ -88,12 +88,13 @@ abstract class qbehaviour_renderer extends plugin_renderer_base { array('id' => $id, 'name' => $inputname, 'rows' => 10, 'cols' => 60))); $commenteditor .= html_writer::start_tag('div'); - if (count($formats == 1)) { + if (count($formats) == 1) { reset($formats); $commenteditor .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => $inputname . 'format', 'value' => key($formats))); } else { + $commenteditor .= html_writer::label(get_string('formattexttype'), 'menu' . $inputname . 'format', false, array('class' => 'accesshide')); $commenteditor .= html_writer::select( $formats, $inputname . 'format', $commentformat, ''); } diff --git a/question/format/xhtml/format.php b/question/format/xhtml/format.php index 0b70c45..a289ae6 100644 --- a/question/format/xhtml/format.php +++ b/question/format/xhtml/format.php @@ -95,12 +95,14 @@ class qformat_xhtml extends qformat_default { break; case SHORTANSWER: $expout .= "
      \n"; - $expout .= "
      • \n"; + $expout .= "
    • " . html_writer::label(get_string('answer'), 'quest_'.$id, false, array('class' => 'accesshide')); + $expout .= "
      • \n"; $expout .= "
    \n"; break; case NUMERICAL: $expout .= "
      \n"; - $expout .= "
      • \n"; + $expout .= "
    • " . html_writer::label(get_string('answer'), 'quest_'.$id, false, array('class' => 'accesshide')); + $expout .= "
      • \n"; $expout .= "
    \n"; break; case MATCH: @@ -114,7 +116,8 @@ class qformat_xhtml extends qformat_default { shuffle( $ans_list ); // random display order // build drop down for answers - $dropdown = "\n"; foreach($ans_list as $ans) { $dropdown .= "\n"; } diff --git a/question/format/xhtml/lang/en/qformat_xhtml.php b/question/format/xhtml/lang/en/qformat_xhtml.php index e5492eb..ddbadfc 100644 --- a/question/format/xhtml/lang/en/qformat_xhtml.php +++ b/question/format/xhtml/lang/en/qformat_xhtml.php @@ -26,3 +26,4 @@ $string['pluginname'] = 'XHTML format'; $string['pluginname_help'] = 'XHTML format enables all questions in the category to be exported to a single page of strict XHTML for possible use in another application.'; $string['pluginname_link'] = 'qformat/xhtml'; +$string['selectansweroption'] = 'Select answer option'; diff --git a/question/type/calculated/lang/en/qtype_calculated.php b/question/type/calculated/lang/en/qtype_calculated.php index 36e2d1d..a27d9be 100644 --- a/question/type/calculated/lang/en/qtype_calculated.php +++ b/question/type/calculated/lang/en/qtype_calculated.php @@ -49,6 +49,7 @@ $string['datasetrole']= ' The wild cards {x..} will be substitu $string['decimals'] = 'with {$a}'; $string['deleteitem'] = 'Delete item'; $string['deletelastitem'] = 'Delete last item'; +$string['distributionoption'] = 'Select distribution option'; $string['editdatasets'] = 'Edit the wildcards datasets'; $string['editdatasets_help'] = 'Wildcard values may be created by entering a number in each wild card field then clicking the add button. To automatically generate 10 or more values, select the number of values required before clicking the add button. A uniform distribution means any value between the limits is equally likely to be generated; a loguniform distribution means that values towards the lower limit are more likely.'; $string['editdatasets_link'] = 'question/type/calculated'; @@ -79,6 +80,7 @@ $string['keptlocal1'] = 'will use the same existing private dataset as before'; $string['keptlocal2'] = 'a file from the same question private set of files as before'; $string['keptlocal3'] = 'a link from the same question private set of links as before'; $string['lastitem(s)'] = 'last items(s)'; +$string['lengthoption'] = 'Select length option'; $string['loguniform'] = 'Loguniform'; $string['loguniformbit'] = 'digits, from a loguniform distribution'; $string['makecopynextpage'] = 'Next page (new question)'; diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index a4655a4..c0ab753 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -751,11 +751,13 @@ class qtype_calculated extends question_type { ? 'decimals' : 'significantfigures'), 'qtype_calculated', $i); } - $menu1 = html_writer::select($lengthoptions, 'calclength[]', $regs[4], null); + $menu1 = html_writer::label(get_string('lengthoption', 'qtype_calculated'), 'menucalclength', false, array('class' => 'accesshide')); + $menu1 .= html_writer::select($lengthoptions, 'calclength[]', $regs[4], null); $options = array('uniform' => get_string('uniformbit', 'qtype_calculated'), 'loguniform' => get_string('loguniformbit', 'qtype_calculated')); - $menu2 = html_writer::select($options, 'calcdistribution[]', $regs[1], null); + $menu2 = html_writer::label(get_string('distributionoption', 'qtype_calculated'), 'menucalcdistribution', false, array('class' => 'accesshide')); + $menu2 .= html_writer::select($options, 'calcdistribution[]', $regs[1], null); return '
    ' diff --git a/question/type/essay/lang/en/qtype_essay.php b/question/type/essay/lang/en/qtype_essay.php index 2e8d524..735a968 100644 --- a/question/type/essay/lang/en/qtype_essay.php +++ b/question/type/essay/lang/en/qtype_essay.php @@ -38,3 +38,4 @@ $string['pluginnameediting'] = 'Editing an Essay question'; $string['pluginnamesummary'] = 'Allows a response of a few sentences or paragraphs. This must then be graded manually.'; $string['responsefieldlines'] = 'Input box size'; $string['responseformat'] = 'Response format'; +$string['selectanswerformat'] = 'Select answer format'; diff --git a/question/type/essay/renderer.php b/question/type/essay/renderer.php index ac2bac9..a189b24 100644 --- a/question/type/essay/renderer.php +++ b/question/type/essay/renderer.php @@ -219,12 +219,13 @@ class qtype_essay_format_editor_renderer extends plugin_renderer_base { array('id' => $id, 'name' => $inputname, 'rows' => $lines, 'cols' => 60))); $output .= html_writer::start_tag('div'); - if (count($formats == 1)) { + if (count($formats) == 1) { reset($formats); $output .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => $inputname . 'format', 'value' => key($formats))); } else { + $output .= html_writer::label(get_string('selectanswerformat'), 'menu' . $inputname . 'format', false, array("class" => 'accesshide')); $output .= html_writer::select($formats, $inputname . 'format', $responseformat, ''); } $output .= html_writer::end_tag('div'); diff --git a/question/type/match/lang/en/qtype_match.php b/question/type/match/lang/en/qtype_match.php index a096607..4b7bc71 100644 --- a/question/type/match/lang/en/qtype_match.php +++ b/question/type/match/lang/en/qtype_match.php @@ -40,3 +40,4 @@ $string['pluginname_link'] = 'question/type/match'; $string['pluginnameadding'] = 'Adding a Matching question'; $string['pluginnameediting'] = 'Editing a Matching question'; $string['pluginnamesummary'] = 'The answer to each of a number of sub-question must be selected from a list of possibilities.'; +$string['selectananswer'] = 'Select an answer'; diff --git a/question/type/match/renderer.php b/question/type/match/renderer.php index 8a3372c..0a464ef 100644 --- a/question/type/match/renderer.php +++ b/question/type/match/renderer.php @@ -80,6 +80,7 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer { } $result .= html_writer::tag('td', + html_writer::label(get_string('selectananswer', 'qtype_match'), 'menu' . $qa->get_qt_field_name('sub' . $key), false, array('class' => 'accesshide')) . html_writer::select($choices, $qa->get_qt_field_name('sub' . $key), $selected, array('0' => 'choose'), array('disabled' => $options->readonly)) . ' ' . $feedbackimage, array('class' => $classes)); diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php index 547a370d..b4c0650 100644 --- a/question/type/multianswer/renderer.php +++ b/question/type/multianswer/renderer.php @@ -223,7 +223,7 @@ class qtype_multianswer_textfield_renderer extends qtype_multianswer_subq_render s($correctanswer->answer), $options); $output = ''; - $output .= html_writer::start_tag('label', array('class' => 'subq')); + $output .= html_writer::start_tag('label', array('class' => 'subq', 'for' => $inputattributes['id'])); $output .= html_writer::empty_tag('input', $inputattributes); $output .= $feedbackimg; $output .= $feedbackpopup; @@ -274,8 +274,8 @@ class qtype_multianswer_multichoice_inline_renderer $inputattributes['class'] = $this->feedback_class($matchinganswer->fraction); $feedbackimg = $this->feedback_image($matchinganswer->fraction); } - - $select = html_writer::select($choices, $qa->get_qt_field_name($fieldname), + $select = html_writer::label($response, $inputattributes['id'], false, array('class' => 'accesshide')); + $select .= html_writer::select($choices, $qa->get_qt_field_name($fieldname), $response, array('' => ''), $inputattributes); $order = $subq->get_order($qa); diff --git a/question/type/numerical/renderer.php b/question/type/numerical/renderer.php index 7689a2c..2486740 100644 --- a/question/type/numerical/renderer.php +++ b/question/type/numerical/renderer.php @@ -76,7 +76,8 @@ class qtype_numerical_renderer extends qtype_renderer { $inputattributes['size'] = round(strlen($placeholder) * 1.1); } - $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg; + $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide')); + $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg; if ($question->has_separate_unit_field()) { if ($question->unitdisplay == qtype_numerical::UNITRADIO) { @@ -98,7 +99,9 @@ class qtype_numerical_renderer extends qtype_renderer { array('class' => 'unitchoices')); } else if ($question->unitdisplay == qtype_numerical::UNITSELECT) { - $unitchoice = html_writer::select($question->ap->get_unit_options(), + $unitchoice = html_writer::label(get_string('selectunits', 'qtype_numerical'), + 'menu' . $qa->get_qt_field_name('unit'), false, array('class' => 'accesshide')); + $unitchoice .= html_writer::select($question->ap->get_unit_options(), $qa->get_qt_field_name('unit'), $selectedunit, array(''=>'choosedots'), array('disabled' => $options->readonly)); } diff --git a/question/type/shortanswer/renderer.php b/question/type/shortanswer/renderer.php index e7879bf..0595b57 100644 --- a/question/type/shortanswer/renderer.php +++ b/question/type/shortanswer/renderer.php @@ -71,8 +71,8 @@ class qtype_shortanswer_renderer extends qtype_renderer { $placeholder = $matches[0]; $inputattributes['size'] = round(strlen($placeholder) * 1.1); } - - $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg; + $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide')); + $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg; if ($placeholder) { $questiontext = substr_replace($questiontext, $input, -- 1.7.9.5 From d3187c299a14659bd5ec5ccc3e4a243ba3659583 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 23 Aug 2012 15:54:39 +0800 Subject: [PATCH 723/903] MDL-34570 Accessibility: Adding labels on text inputs and selects to questions --- question/behaviour/rendererbase.php | 20 ++++++++++++------- question/format/xhtml/format.php | 21 +++++++++++--------- question/format/xhtml/lang/en/qformat_xhtml.php | 1 - question/type/essay/lang/en/qtype_essay.php | 1 - question/type/essay/renderer.php | 3 ++- question/type/match/lang/en/qtype_match.php | 2 +- question/type/match/renderer.php | 4 +++- question/type/multianswer/renderer.php | 11 +++++----- .../type/numerical/lang/en/qtype_numerical.php | 1 + question/type/numerical/renderer.php | 14 +++++++------ question/type/shortanswer/renderer.php | 13 +++++++----- 11 files changed, 53 insertions(+), 38 deletions(-) diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php index 78de4db..e04a638 100644 --- a/question/behaviour/rendererbase.php +++ b/question/behaviour/rendererbase.php @@ -86,25 +86,30 @@ abstract class qbehaviour_renderer extends plugin_renderer_base { $commenteditor = html_writer::tag('div', html_writer::tag('textarea', s($commenttext), array('id' => $id, 'name' => $inputname, 'rows' => 10, 'cols' => 60))); + $commenteditor .= html_writer::end_tag('div'); - $commenteditor .= html_writer::start_tag('div'); + $editorformat = ''; if (count($formats) == 1) { reset($formats); - $commenteditor .= html_writer::empty_tag('input', array('type' => 'hidden', + $editorformat .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => $inputname . 'format', 'value' => key($formats))); - } else { - $commenteditor .= html_writer::label(get_string('formattexttype'), 'menu' . $inputname . 'format', false, array('class' => 'accesshide')); - $commenteditor .= html_writer::select( - $formats, $inputname . 'format', $commentformat, ''); + $editorformat = html_writer::start_tag('div', array('class' => 'fitem')); + $editorformat .= html_writer::start_tag('div', array('class' => 'fitemtitle')); + $editorformat .= html_writer::tag('label', get_string('format'), array('for'=>'menu'.$inputname.'format')); + $editorformat .= html_writer::end_tag('div'); + $editorformat .= html_writer::start_tag('div', array('class' => 'felement fhtmleditor')); + $editorformat .= html_writer::select($formats, $inputname.'format', $commentformat, ''); + $editorformat .= html_writer::end_tag('div'); + $editorformat .= html_writer::end_tag('div'); } - $commenteditor .= html_writer::end_tag('div'); $comment = html_writer::tag('div', html_writer::tag('div', html_writer::tag('label', get_string('comment', 'question'), array('for' => $id)), array('class' => 'fitemtitle')) . html_writer::tag('div', $commenteditor, array('class' => 'felement fhtmleditor')), array('class' => 'fitem')); + $comment .= $editorformat; $mark = ''; if ($qa->get_max_mark()) { @@ -118,6 +123,7 @@ abstract class qbehaviour_renderer extends plugin_renderer_base { 'type' => 'text', 'size' => $fieldsize, 'name' => $markfield, + 'id'=> $markfield ); if (!is_null($currentmark)) { $attributes['value'] = $qa->format_fraction_as_mark( diff --git a/question/format/xhtml/format.php b/question/format/xhtml/format.php index a289ae6..7c929d6 100644 --- a/question/format/xhtml/format.php +++ b/question/format/xhtml/format.php @@ -115,19 +115,22 @@ class qformat_xhtml extends qformat_default { } shuffle( $ans_list ); // random display order - // build drop down for answers - $dropdown = html_writer::label(get_string('selectansweroption'), 'quest_'.$id, false, array('class' => 'accesshide')); - $dropdown .= "\n"; - // finally display + // display + $option = 0; foreach($question->options->subquestions as $subquestion) { - $quest_text = $this->repchar( $subquestion->questiontext ); - $expout .= "
  • $quest_text
    • \n"; - $expout .= $dropdown; + // build drop down for answers + $quest_text = $this->repchar( $subquestion->questiontext ); + $dropdown = html_writer::label(get_string('answer', 'qtype_match', $option+1), 'quest_'.$id.'_'.$option, false, array('class' => 'accesshide')); + $dropdown .= "\n"; + $expout .= "
  • $quest_text
    • \n"; + $expout .= $dropdown; + $option++; } $expout .= "\n"; break; diff --git a/question/format/xhtml/lang/en/qformat_xhtml.php b/question/format/xhtml/lang/en/qformat_xhtml.php index ddbadfc..e5492eb 100644 --- a/question/format/xhtml/lang/en/qformat_xhtml.php +++ b/question/format/xhtml/lang/en/qformat_xhtml.php @@ -26,4 +26,3 @@ $string['pluginname'] = 'XHTML format'; $string['pluginname_help'] = 'XHTML format enables all questions in the category to be exported to a single page of strict XHTML for possible use in another application.'; $string['pluginname_link'] = 'qformat/xhtml'; -$string['selectansweroption'] = 'Select answer option'; diff --git a/question/type/essay/lang/en/qtype_essay.php b/question/type/essay/lang/en/qtype_essay.php index 735a968..2e8d524 100644 --- a/question/type/essay/lang/en/qtype_essay.php +++ b/question/type/essay/lang/en/qtype_essay.php @@ -38,4 +38,3 @@ $string['pluginnameediting'] = 'Editing an Essay question'; $string['pluginnamesummary'] = 'Allows a response of a few sentences or paragraphs. This must then be graded manually.'; $string['responsefieldlines'] = 'Input box size'; $string['responseformat'] = 'Response format'; -$string['selectanswerformat'] = 'Select answer format'; diff --git a/question/type/essay/renderer.php b/question/type/essay/renderer.php index a189b24..1905e2e 100644 --- a/question/type/essay/renderer.php +++ b/question/type/essay/renderer.php @@ -225,7 +225,8 @@ class qtype_essay_format_editor_renderer extends plugin_renderer_base { 'name' => $inputname . 'format', 'value' => key($formats))); } else { - $output .= html_writer::label(get_string('selectanswerformat'), 'menu' . $inputname . 'format', false, array("class" => 'accesshide')); + $output .= html_writer::label(get_string('format'), 'menu' . $inputname . 'format', false); + $output .= ' '; $output .= html_writer::select($formats, $inputname . 'format', $responseformat, ''); } $output .= html_writer::end_tag('div'); diff --git a/question/type/match/lang/en/qtype_match.php b/question/type/match/lang/en/qtype_match.php index 4b7bc71..5dd3c4a 100644 --- a/question/type/match/lang/en/qtype_match.php +++ b/question/type/match/lang/en/qtype_match.php @@ -24,6 +24,7 @@ */ $string['addmoreqblanks'] = '{no} More Sets of Blanks'; +$string['answer'] = 'Answer {$a}'; $string['availablechoices'] = 'Available choices'; $string['correctansweris'] = 'The correct answer is: {$a}'; $string['filloutthreeqsandtwoas'] = 'You must provide at least two questions and three answers. You can provide extra wrong answers by giving an answer with a blank question. Entries where both the question and the answer are blank will be ignored.'; @@ -40,4 +41,3 @@ $string['pluginname_link'] = 'question/type/match'; $string['pluginnameadding'] = 'Adding a Matching question'; $string['pluginnameediting'] = 'Editing a Matching question'; $string['pluginnamesummary'] = 'The answer to each of a number of sub-question must be selected from a list of possibilities.'; -$string['selectananswer'] = 'Select an answer'; diff --git a/question/type/match/renderer.php b/question/type/match/renderer.php index 0a464ef..2cadb7e 100644 --- a/question/type/match/renderer.php +++ b/question/type/match/renderer.php @@ -53,6 +53,7 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer { $result .= html_writer::start_tag('tbody'); $parity = 0; + $i = 1; foreach ($stemorder as $key => $stemid) { $result .= html_writer::start_tag('tr', array('class' => 'r' . $parity)); @@ -80,13 +81,14 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer { } $result .= html_writer::tag('td', - html_writer::label(get_string('selectananswer', 'qtype_match'), 'menu' . $qa->get_qt_field_name('sub' . $key), false, array('class' => 'accesshide')) . + html_writer::label(get_string('answer', 'qtype_match', $i), 'menu' . $qa->get_qt_field_name('sub' . $key), false, array('class' => 'accesshide')) . html_writer::select($choices, $qa->get_qt_field_name('sub' . $key), $selected, array('0' => 'choose'), array('disabled' => $options->readonly)) . ' ' . $feedbackimage, array('class' => $classes)); $result .= html_writer::end_tag('tr'); $parity = 1 - $parity; + $i++; } $result .= html_writer::end_tag('tbody'); $result .= html_writer::end_tag('table'); diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php index b4c0650..86d5646 100644 --- a/question/type/multianswer/renderer.php +++ b/question/type/multianswer/renderer.php @@ -223,11 +223,11 @@ class qtype_multianswer_textfield_renderer extends qtype_multianswer_subq_render s($correctanswer->answer), $options); $output = ''; - $output .= html_writer::start_tag('label', array('class' => 'subq', 'for' => $inputattributes['id'])); + $output .= html_writer::tag('label', get_string('answer'), + array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); $output .= html_writer::empty_tag('input', $inputattributes); $output .= $feedbackimg; $output .= $feedbackpopup; - $output .= html_writer::end_tag('label'); return $output; } @@ -274,8 +274,7 @@ class qtype_multianswer_multichoice_inline_renderer $inputattributes['class'] = $this->feedback_class($matchinganswer->fraction); $feedbackimg = $this->feedback_image($matchinganswer->fraction); } - $select = html_writer::label($response, $inputattributes['id'], false, array('class' => 'accesshide')); - $select .= html_writer::select($choices, $qa->get_qt_field_name($fieldname), + $select = html_writer::select($choices, $qa->get_qt_field_name($fieldname), $response, array('' => ''), $inputattributes); $order = $subq->get_order($qa); @@ -288,11 +287,11 @@ class qtype_multianswer_multichoice_inline_renderer $qa, 'question', 'answer', $rightanswer->id), $options); $output = ''; - $output .= html_writer::start_tag('label', array('class' => 'subq')); + $output .= html_writer::tag('label', get_string('answer'), + array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); $output .= $select; $output .= $feedbackimg; $output .= $feedbackpopup; - $output .= html_writer::end_tag('label'); return $output; } diff --git a/question/type/numerical/lang/en/qtype_numerical.php b/question/type/numerical/lang/en/qtype_numerical.php index 75dc457..fb4784b 100644 --- a/question/type/numerical/lang/en/qtype_numerical.php +++ b/question/type/numerical/lang/en/qtype_numerical.php @@ -26,6 +26,7 @@ $string['acceptederror'] = 'Accepted error'; $string['addmoreanswerblanks'] = 'Blanks for {no} More Answers'; $string['addmoreunitblanks'] = 'Blanks for {no} More Units'; +$string['answercolon'] = 'Answer:'; $string['answermustbenumberorstar'] = 'The answer must be a number, for example -1.234 or 3e8, or \'*\'.'; $string['answerno'] = 'Answer {$a}'; $string['decfractionofquestiongrade'] = 'as a fraction (0-1) of the question grade'; diff --git a/question/type/numerical/renderer.php b/question/type/numerical/renderer.php index 2486740..d1b7c0a 100644 --- a/question/type/numerical/renderer.php +++ b/question/type/numerical/renderer.php @@ -76,8 +76,7 @@ class qtype_numerical_renderer extends qtype_renderer { $inputattributes['size'] = round(strlen($placeholder) * 1.1); } - $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide')); - $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg; + $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg; if ($question->has_separate_unit_field()) { if ($question->unitdisplay == qtype_numerical::UNITRADIO) { @@ -99,7 +98,7 @@ class qtype_numerical_renderer extends qtype_renderer { array('class' => 'unitchoices')); } else if ($question->unitdisplay == qtype_numerical::UNITSELECT) { - $unitchoice = html_writer::label(get_string('selectunits', 'qtype_numerical'), + $unitchoice = html_writer::label(get_string('selectunit', 'qtype_numerical'), 'menu' . $qa->get_qt_field_name('unit'), false, array('class' => 'accesshide')); $unitchoice .= html_writer::select($question->ap->get_unit_options(), $qa->get_qt_field_name('unit'), $selectedunit, array(''=>'choosedots'), @@ -114,7 +113,10 @@ class qtype_numerical_renderer extends qtype_renderer { } if ($placeholder) { - $questiontext = substr_replace($questiontext, $input, + $inputinplace = html_writer::tag('label', get_string('answer'), + array('for' => $inputattributes['id'], 'class' => 'accesshide')); + $inputinplace .= $input; + $questiontext = substr_replace($questiontext, $inputinplace, strpos($questiontext, $placeholder), strlen($placeholder)); } @@ -122,8 +124,8 @@ class qtype_numerical_renderer extends qtype_renderer { if (!$placeholder) { $result .= html_writer::start_tag('div', array('class' => 'ablock')); - $result .= get_string('answer', 'qtype_shortanswer', - html_writer::tag('div', $input, array('class' => 'answer'))); + $result .= html_writer::tag('label', get_string('answercolon', 'qtype_numerical'), array('for' => $inputattributes['id'])); + $result .= html_writer::tag('span', $input, array('class' => 'answer')); $result .= html_writer::end_tag('div'); } diff --git a/question/type/shortanswer/renderer.php b/question/type/shortanswer/renderer.php index 0595b57..cfdca17 100644 --- a/question/type/shortanswer/renderer.php +++ b/question/type/shortanswer/renderer.php @@ -71,11 +71,13 @@ class qtype_shortanswer_renderer extends qtype_renderer { $placeholder = $matches[0]; $inputattributes['size'] = round(strlen($placeholder) * 1.1); } - $input = html_writer::label($inputattributes['name'], $inputattributes['id'], false, array('class' => 'accesshide')); - $input .= html_writer::empty_tag('input', $inputattributes) . $feedbackimg; + $input = html_writer::empty_tag('input', $inputattributes) . $feedbackimg; if ($placeholder) { - $questiontext = substr_replace($questiontext, $input, + $inputinplace = html_writer::tag('label', get_string('answer'), + array('for' => $inputattributes['id'], 'class' => 'accesshide')); + $inputinplace .= $input; + $questiontext = substr_replace($questiontext, $inputinplace, strpos($questiontext, $placeholder), strlen($placeholder)); } @@ -83,8 +85,9 @@ class qtype_shortanswer_renderer extends qtype_renderer { if (!$placeholder) { $result .= html_writer::start_tag('div', array('class' => 'ablock')); - $result .= get_string('answer', 'qtype_shortanswer', - html_writer::tag('div', $input, array('class' => 'answer'))); + $result .= html_writer::tag('label', get_string('answer', 'qtype_shortanswer', + html_writer::tag('span', $input, array('class' => 'answer'))), + array('for' => $inputattributes['id'])); $result .= html_writer::end_tag('div'); } -- 1.7.9.5 From 60b6b6280b8d9b3f7fdab93dc9dde9a2ca4a24e5 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 14 Aug 2012 20:24:33 +0800 Subject: [PATCH 724/903] MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability --- grade/report/user/lib.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index 915aefd..5b92b1c 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -228,6 +228,26 @@ class grade_report_user extends grade_report { } $count = 1; foreach ($element['children'] as $key=>$child) { + + $grade_object = $child['object']; + // If grade object isn't hidden + if ($grade_object->hidden != 1) { + + // If grade object is an module instance + if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) { + + $instances = $this->gtree->modinfo->get_instances(); + // If we can find the module instance + if (!empty($instances[$grade_object->itemmodule][$grade_object->iteminstance])) { + + $cm = $instances[$grade_object->itemmodule][$grade_object->iteminstance]; + // Skip generating rowspans if the user cannot see the module instance + if (!$cm->uservisible) { + continue; + } + } + } + } $count += $this->inject_rowspans($element['children'][$key]); } $element['rowspan'] = $count; -- 1.7.9.5 From b865c07b69a85d6d4720dc66b8745cf8936bcdbb Mon Sep 17 00:00:00 2001 From: Raymond Wijaya Date: Wed, 12 Sep 2012 16:33:54 +0800 Subject: [PATCH 725/903] MDL-35665: Cherry-pick MDL-35389 : Fix an error when changing locked state of a assignment is changed --- mod/assign/lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/assign/lib.php b/mod/assign/lib.php index 070dc50..74cfd3b 100644 --- a/mod/assign/lib.php +++ b/mod/assign/lib.php @@ -757,7 +757,9 @@ function assign_get_user_grades($assign, $userid=0) { global $CFG; require_once($CFG->dirroot . '/mod/assign/locallib.php'); - $assignment = new assign(null, null, null); + $cm = get_coursemodule_from_instance('assign', $assign->id, 0, false, MUST_EXIST); + $context = context_module::instance($cm->id); + $assignment = new assign($context, null, null); $assignment->set_instance($assign); return $assignment->get_user_grades_for_gradebook($userid); } -- 1.7.9.5 From 10839ace75f9b5c2849f1a7fc051a9ddc1c9f92a Mon Sep 17 00:00:00 2001 From: Raymond Wijaya Date: Tue, 21 Aug 2012 15:50:56 +0800 Subject: [PATCH 726/903] MDL-34794_M23: Add reset course feature in mod_assign (new assignment) --- mod/assign/lang/en/assign.php | 1 + mod/assign/lib.php | 66 +++++++++++++++++++++++++++++++++++ mod/assign/locallib.php | 76 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index 96c1c22..f362421 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -78,6 +78,7 @@ $string['couldnotfindassignmenttoupgrade'] = 'Could not find old assignment inst $string['currentgrade'] = 'Current grade in gradebook'; $string['defaultplugins'] = 'Default assignment settings'; $string['defaultplugins_help'] = 'These settings define the defaults for all new assignments.'; +$string['deleteallsubmissions'] = 'Delete all submissions'; $string['deletepluginareyousure'] = 'Delete assignment plugin {$a}: are you sure?'; $string['deletepluginareyousuremessage'] = 'You are about to completely delete the assignment plugin {$a}. This will completely delete everything in the database associated with this assignment plugin. Are you SURE you want to continue?'; $string['deletingplugin'] = 'Deleting plugin {$a}.'; diff --git a/mod/assign/lib.php b/mod/assign/lib.php index 070dc50..e370467 100644 --- a/mod/assign/lib.php +++ b/mod/assign/lib.php @@ -55,6 +55,72 @@ function assign_delete_instance($id) { } /** + * This function is used by the reset_course_userdata function in moodlelib. + * This function will remove all assignment submissions and feedbacks in the database + * and clean up any related data. + * @param $data the data submitted from the reset course. + * @return array status array + */ +function assign_reset_userdata($data) { + global $CFG, $DB; + require_once($CFG->dirroot . '/mod/assign/locallib.php'); + + $status = array(); + $params = array('courseid'=>$data->courseid); + $sql = "SELECT a.id FROM {assign} a WHERE a.course=:courseid"; + $course = $DB->get_record('course', array('id'=> $data->courseid), '*', MUST_EXIST); + if ($assigns = $DB->get_records_sql($sql,$params)) { + foreach ($assigns as $assign) { + $cm = get_coursemodule_from_instance('assign', $assign->id, $data->courseid, false, MUST_EXIST); + $context = context_module::instance($cm->id); + $assignment = new assign($context, $cm, $course); + $status = array_merge($status, $assignment->reset_userdata($data)); + } + } + return $status; +} + +/** + * Removes all grades from gradebook + * + * @param int $courseid The ID of the course to reset + * @param string $type Optional type of assignment to limit the reset to a particular assignment type + */ +function assign_reset_gradebook($courseid, $type='') { + global $CFG, $DB; + + $params = array('moduletype'=>'assign','courseid'=>$courseid); + $sql = 'SELECT a.*, cm.idnumber as cmidnumber, a.course as courseid + FROM {assign} a, {course_modules} cm, {modules} m + WHERE m.name=:moduletype AND m.id=cm.module AND cm.instance=a.id AND a.course=:courseid'; + + if ($assignments = $DB->get_records_sql($sql,$params)) { + foreach ($assignments as $assignment) { + assign_grade_item_update($assignment, 'reset'); + } + } +} + +/** + * Implementation of the function for printing the form elements that control + * whether the course reset functionality affects the assignment. + * @param $mform form passed by reference + */ +function assign_reset_course_form_definition(&$mform) { + $mform->addElement('header', 'assignheader', get_string('modulenameplural', 'assign')); + $mform->addElement('advcheckbox', 'reset_assign_submissions', get_string('deleteallsubmissions','assign')); +} + +/** + * Course reset form defaults. + * @param object $course + * @return array + */ +function assign_reset_course_form_defaults($course) { + return array('reset_assign_submissions'=>1); +} + +/** * Update an assignment instance * * This is done by calling the update_instance() method of the assignment type class diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 8ba72d4..7238b70 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -506,6 +506,82 @@ class assign { } /** + * Actual implementation of the reset course functionality, delete all the + * assignment submissions for course $data->courseid. + * + * @param $data the data submitted from the reset course. + * @return array status array + */ + public function reset_userdata($data) { + global $CFG,$DB; + + $componentstr = get_string('modulenameplural', 'assign'); + $status = array(); + + $fs = get_file_storage(); + if (!empty($data->reset_assign_submissions)) { + // Delete files associated with this assignment. + foreach ($this->submissionplugins as $plugin) { + $fileareas = array(); + $plugincomponent = $plugin->get_subtype() . '_' . $plugin->get_type(); + $fileareas = $plugin->get_file_areas(); + foreach ($fileareas as $filearea) { + $fs->delete_area_files($this->context->id, $plugincomponent, $filearea); + } + + if (!$plugin->delete_instance()) { + $status[] = array('component'=>$componentstr, + 'item'=>get_string('deleteallsubmissions','assign'), + 'error'=>$plugin->get_error()); + } + } + + foreach ($this->feedbackplugins as $plugin) { + $fileareas = array(); + $plugincomponent = $plugin->get_subtype() . '_' . $plugin->get_type(); + $fileareas = $plugin->get_file_areas(); + foreach ($fileareas as $filearea) { + $fs->delete_area_files($this->context->id, $plugincomponent, $filearea); + } + + if (!$plugin->delete_instance()) { + $status[] = array('component'=>$componentstr, + 'item'=>get_string('deleteallsubmissions','assign'), + 'error'=>$plugin->get_error()); + } + } + + $assignssql = "SELECT a.id + FROM {assign} a + WHERE a.course=:course"; + $params = array ("course" => $data->courseid); + + $DB->delete_records_select('assign_submission', "assignment IN ($assignssql)", $params); + $status[] = array('component'=>$componentstr, + 'item'=>get_string('deleteallsubmissions','assign'), + 'error'=>false); + + if (empty($data->reset_gradebook_grades)) { + // Remove all grades from gradebook. + require_once($CFG->dirroot.'/mod/assign/lib.php'); + assign_reset_gradebook($data->courseid); + } + } + // Updating dates - shift may be negative too. + if ($data->timeshift) { + shift_course_mod_dates('assign', + array('duedate', 'allowsubmissionsfromdate'), + $data->timeshift, + $data->courseid); + $status[] = array('component'=>$componentstr, + 'item'=>get_string('datechanged'), + 'error'=>false); + } + + return $status; + } + + /** * Update the settings for a single plugin * * @param assign_plugin $plugin The plugin to update -- 1.7.9.5 From 0222cd954510a4bcfe47c3f05622e37294d51551 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Fri, 28 Sep 2012 15:28:27 +0100 Subject: [PATCH 727/903] MDL-35693 question engine: set id when saving a new question_attempt --- question/engine/datalib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/question/engine/datalib.php b/question/engine/datalib.php index 6fbccbf..86d58f3 100644 --- a/question/engine/datalib.php +++ b/question/engine/datalib.php @@ -117,6 +117,7 @@ class question_engine_data_mapper { $record->responsesummary = $qa->get_response_summary(); $record->timemodified = time(); $record->id = $this->db->insert_record('question_attempts', $record); + $qa->set_database_id($record->id); foreach ($qa->get_step_iterator() as $seq => $step) { $this->insert_question_attempt_step($step, $record->id, $seq, $context); -- 1.7.9.5 From 6b7cd710cdf724b1b06da252685f914047a5c011 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Sat, 29 Sep 2012 00:34:18 +0000 Subject: [PATCH 728/903] Automatically generated installer lang files --- install/lang/es_mx/install.php | 2 +- install/lang/fi/install.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/install/lang/es_mx/install.php b/install/lang/es_mx/install.php index 91a4a09..7de314e 100644 --- a/install/lang/es_mx/install.php +++ b/install/lang/es_mx/install.php @@ -85,7 +85,7 @@ $string['phpversionhelp'] = '

    Moodle requiere al menos una versión de PHP 4.3 (En caso de 5.0.x podría también revertir a la versión 4.4.x)

    '; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Si está viendo esta página es porque ha podido ejecutar el paquete {$a->packname} {$a->packversion} en su computadora. !Enhorabuena!'; -$string['welcomep30'] = 'Esta versión de {$a->installername} incluye las aplicaciones necesarias para que Moodle funcione en su computadora principalmente:'; +$string['welcomep30'] = 'Esta versión de {$a->installername} incluye las aplicaciones necesarias para que Moodle funcione en su computadora, principalmente:'; $string['welcomep40'] = 'El paquete también incluye Moodle {$a->moodlerelease} ({$a->moodleversion}).'; $string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobernado por sus respectivas licencias. El programa {$a->installername} es diff --git a/install/lang/fi/install.php b/install/lang/fi/install.php index cffb9b0..57673d4 100644 --- a/install/lang/fi/install.php +++ b/install/lang/fi/install.php @@ -82,9 +82,7 @@ $string['pathsunsecuredataroot'] = 'Dataroot-sijainti on turvallinen'; $string['pathswrongadmindir'] = 'Admin-hakemistoa ei ole'; $string['phpextension'] = '{$a} PHP-lisäosa'; $string['phpversion'] = 'PHP versio'; -$string['phpversionhelp'] = '

    Moodle vaatii vähintään PHP version 4.1.0.

    -

    Käytät parhaillaan versiota {$a}

    -

    Sinun täytyy päivittää PHP tai siirtää isäntä uudemman PHP version kanssa!

    '; +$string['phpversionhelp'] = '

    Moodle vaatii vähintään PHP-version 4.3.0 tai 5.1.0 (5.0.x sisältää monia tunnettuja ongelmia).

    Käytössäsi on versio {$a}

    Sinun pitää päivittää PHP tai siirtää palvelimelle jossa on uudempi PHP.
    (Jos käytössäsi on 5.0.x voit myös päivittää alaspäin 4.4.x -versioon)

    '; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Näet tämän sivun koska olet onnistuneesti asentanut ja käynnistänyt {$a->packname} {$a->packversion} paketin tietokoneellasi. Onnittelut!'; -- 1.7.9.5 From 2d04a1fe31f7c199d52f8f03e8247236c54ae5e2 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Sat, 29 Sep 2012 09:34:29 +0100 Subject: [PATCH 729/903] MDL-35698 quiz cron: group overrides not computed correctly Thanks to Matt Petro for finding the bug in this monster SQL statement. --- mod/quiz/cronlib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/quiz/cronlib.php b/mod/quiz/cronlib.php index 7913b63..9e4e6a4 100644 --- a/mod/quiz/cronlib.php +++ b/mod/quiz/cronlib.php @@ -117,8 +117,8 @@ class mod_quiz_overdue_attempt_updater { FROM {quiz_attempts} iquiza JOIN {quiz} quiz ON quiz.id = iquiza.quiz LEFT JOIN {quiz_overrides} quo ON quo.quiz = quiz.id AND quo.userid = iquiza.userid - LEFT JOIN {quiz_overrides} qgo ON qgo.quiz = quiz.id - LEFT JOIN {groups_members} gm ON gm.userid = iquiza.userid AND gm.groupid = qgo.groupid + LEFT JOIN {groups_members} gm ON gm.userid = iquiza.userid + LEFT JOIN {quiz_overrides} qgo ON qgo.quiz = quiz.id AND qgo.groupid = gm.groupid WHERE iquiza.state IN ('inprogress', 'overdue') AND iquiza.timemodified >= :processfrom -- 1.7.9.5 From d69578571023104b8e46eac9f82d66b24ff263a3 Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Thu, 5 Jul 2012 13:43:33 +0800 Subject: [PATCH 730/903] MDL-33829 - Glossary - Adding Rich Portfolio Export support --- mod/glossary/locallib.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mod/glossary/locallib.php b/mod/glossary/locallib.php index 2f0b448..c569b18 100644 --- a/mod/glossary/locallib.php +++ b/mod/glossary/locallib.php @@ -266,6 +266,12 @@ class glossary_entry_portfolio_caller extends portfolio_module_caller_base { $fs->get_area_files($context->id, 'mod_glossary', 'attachment', $this->entry->id, "timemodified", false), $fs->get_area_files($context->id, 'mod_glossary', 'entry', $this->entry->id, "timemodified", false) ); + + if (!empty($this->multifiles)) { + $this->add_format(PORTFOLIO_FORMAT_RICHHTML); + } else { + $this->add_format(PORTFOLIO_FORMAT_PLAINHTML); + } } /** -- 1.7.9.5 From 88852071b53d33b3a2b868a3e908bb19c74d6788 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 24 Sep 2012 17:52:52 +0800 Subject: [PATCH 731/903] MDL-33829 mod_glossary: added some smarts so glossary entries with an image in their description are classed as richhtml instead of plainhtml --- mod/glossary/lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 2a307bd..35e7197 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1282,7 +1282,9 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h } } $fs = get_file_storage(); - if ($files = $fs->get_area_files($filecontext->id, 'mod_glossary', 'attachment', $entry->id, "timemodified", false)) { + if ($files = $fs->get_area_files($filecontext->id, 'mod_glossary', 'attachment', $entry->id, "timemodified", false) + || $files = $fs->get_area_files($filecontext->id, 'mod_glossary', 'entry', $entry->id, "timemodified", false)) { + $button->set_formats(PORTFOLIO_FORMAT_RICHHTML); } else { $button->set_formats(PORTFOLIO_FORMAT_PLAINHTML); -- 1.7.9.5 From 24d9d1811f8b91c43a5c604c1eb07eea7c499804 Mon Sep 17 00:00:00 2001 From: Tomasz Muras Date: Thu, 20 Sep 2012 17:48:14 +0200 Subject: [PATCH 732/903] MDL-35547 Detect question category pointing to itself as a parent. --- lib/questionlib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/questionlib.php b/lib/questionlib.php index c8aeacd..5f2cfc1 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1184,6 +1184,10 @@ function question_categorylist($categoryid) { $categorylist = array($categoryid); foreach ($subcategories as $subcategory) { + if($subcategory->id == $categoryid) + //prevent infinite loop + throw new coding_exception("Question category $categoryid points to itself as a parent."); + } $categorylist = array_merge($categorylist, question_categorylist($subcategory->id)); } -- 1.7.9.5 From 2ade1b52f9f44ca80aff60da5ec8b325b2f8fc6f Mon Sep 17 00:00:00 2001 From: Tomasz Muras Date: Fri, 21 Sep 2012 22:01:06 +0200 Subject: [PATCH 733/903] MDL-35547 Detect loops in question categories. --- lib/questionlib.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/questionlib.php b/lib/questionlib.php index 5f2cfc1..c18a763 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1179,16 +1179,24 @@ function question_add_tops($categories, $pcontexts) { function question_categorylist($categoryid) { global $DB; - $subcategories = $DB->get_records('question_categories', - array('parent' => $categoryid), 'sortorder ASC', 'id, 1'); - - $categorylist = array($categoryid); - foreach ($subcategories as $subcategory) { - if($subcategory->id == $categoryid) - //prevent infinite loop - throw new coding_exception("Question category $categoryid points to itself as a parent."); + //final list of category IDs + $categorylist = array(); + + //a list of category IDs to check for any sub-categories + $templist = array($categoryid); + + while ($current = array_shift($templist)) { + if (isset($categorylist[$current])) { + throw new coding_exception("Category id=$current is already on the list - loop of categories detected."); } - $categorylist = array_merge($categorylist, question_categorylist($subcategory->id)); + + $subcategories = $DB->get_records('question_categories', + array('parent' => $current), 'sortorder ASC', 'id, 1'); + foreach ($subcategories as $subcategory) { + $templist[] = $subcategory->id; + } + + $categorylist[$current] = $current; } return $categorylist; -- 1.7.9.5 From d0bb10027b3c2c40c95387fbca5e952d6b976de6 Mon Sep 17 00:00:00 2001 From: Tomasz Muras Date: Sun, 23 Sep 2012 19:25:30 +0200 Subject: [PATCH 734/903] MDL-35547 Fetch more sub-categories with one SQL query. --- lib/questionlib.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/questionlib.php b/lib/questionlib.php index c18a763..311629d 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1179,24 +1179,25 @@ function question_add_tops($categories, $pcontexts) { function question_categorylist($categoryid) { global $DB; - //final list of category IDs + // final list of category IDs $categorylist = array(); - //a list of category IDs to check for any sub-categories - $templist = array($categoryid); + // a list of category IDs to check for any sub-categories + $subcategories = array($categoryid); - while ($current = array_shift($templist)) { - if (isset($categorylist[$current])) { - throw new coding_exception("Category id=$current is already on the list - loop of categories detected."); - } - - $subcategories = $DB->get_records('question_categories', - array('parent' => $current), 'sortorder ASC', 'id, 1'); + while ($subcategories) { foreach ($subcategories as $subcategory) { - $templist[] = $subcategory->id; + // if anything from the temporary list was added already, then we have a loop + if (isset($categorylist[$subcategory])) { + throw new coding_exception("Category id=$subcategory is already on the list - loop of categories detected."); + } + $categorylist[$subcategory] = $subcategory; } - $categorylist[$current] = $current; + list ($in, $params) = $DB->get_in_or_equal($subcategories); + + $subcategories = $DB->get_records_select_menu('question_categories', + "parent $in", $params, NULL, 'id,id AS id2'); } return $categorylist; -- 1.7.9.5 From 194e79536e576c0574568454046a1b807f6a9dab Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 6 Aug 2012 09:29:41 +1200 Subject: [PATCH 735/903] MDL-34234 course: Fixed notice causing issues in JS when upgrade settings for 2.3+ not run --- mod/resource/lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/resource/lib.php b/mod/resource/lib.php index b500784..cac3069 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -512,8 +512,8 @@ function resource_dndupload_handle($uploadinfo) { $data->popupwidth = $config->popupwidth; $data->printheading = $config->printheading; $data->printintro = $config->printintro; - $data->showsize = $config->showsize; - $data->showtype = $config->showtype; + $data->showsize = (isset($config->showsize)) ? $config->showsize : 0; + $data->showtype = (isset($config->showtype)) ? $config->showtype : 0; $data->filterfiles = $config->filterfiles; return resource_add_instance($data, null); -- 1.7.9.5 From af277cc994d6458bea86860846accfdccdf7847a Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sun, 30 Sep 2012 23:53:01 +0200 Subject: [PATCH 736/903] MDL-35708 - Right align user's information in quiz attempt review page , when in RTL mode (theme/standard & base) --- mod/quiz/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index d07442b..3ab0f5a 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -11,6 +11,8 @@ #page-mod-quiz-attempt .submitbtns, #page-mod-quiz-review .submitbtns {clear: left; text-align: left; padding-top: 1.5em;} +#page-mod-quiz-attempt.dir-rtl .submitbtns, +#page-mod-quiz-review.dir-rtl .submitbtns {text-align: right;} body.jsenabled .questionflagcheckbox {display: none;} @@ -27,6 +29,7 @@ body.jsenabled .questionflagcheckbox {display: none;} .path-mod-quiz #user-picture img {width: auto;height: auto;float: left;} .path-mod-quiz .qnbutton {display: block; position: relative; float: left; width: 1.5em; height: 1.5em; overflow: hidden; margin: 0.3em 0.3em 0.3em 0; padding: 0; border: 1px solid #bbb; background: #ddd; text-align: center; vertical-align: middle;line-height: 1.5em !important; font-weight: bold; text-decoration: none;} +.path-mod-quiz.dir-rtl .qnbutton {float: right;} .path-mod-quiz .qnbutton .trafficlight, .path-mod-quiz .qnbutton .thispageholder {display: block; position: absolute; top: 0; bottom: 0; left: 0; right: 0;} @@ -135,6 +138,7 @@ table.quizattemptsummary .noreviewmessage {color: gray;} table.quizreviewsummary {width: 100%;} table.quizreviewsummary th.cell {padding: 1px 0.5em 1px 1em;font-weight: bold;text-align: right;width: 10em;background: #f0f0f0;} table.quizreviewsummary td.cell {padding: 1px 1em 1px 0.5em;text-align: left;background: #fafafa;} +.dir-rtl table.quizreviewsummary td.cell {text-align: right;} /** Mod quiz make comment or override grade popup. **/ #page-mod-quiz-comment .mform {width: 100%;} -- 1.7.9.5 From 410d0dc2435c4bc4e6ede3b3de4b5924c7dd1a44 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 27 Sep 2012 14:29:26 +0800 Subject: [PATCH 737/903] MDL-31782 core_grade: fixed a potential infinite loop --- lib/grade/grade_category.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php index 95b99f8..3fa19ec 100644 --- a/lib/grade/grade_category.php +++ b/lib/grade/grade_category.php @@ -911,7 +911,10 @@ class grade_category extends grade_object { $i = 1; while ($originalindex+$i < count($grade_keys)) { + $possibleitemid = $grade_keys[$originalindex+$i]; + $i++; + if ($grade_values[$founditemid] != $grade_values[$possibleitemid]) { // The next grade item has a different grade. Stop looking. break; @@ -928,8 +931,6 @@ class grade_category extends grade_object { $founditemid = $possibleitemid; // Continue searching to see if there is an even higher grademax... } - - $i++; } // Now drop whatever grade item we have found -- 1.7.9.5 From 7ad8f468489a40bf68e472144e0e69b3bf97f58b Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 1 Oct 2012 12:53:26 +0800 Subject: [PATCH 738/903] MDL-35667 core_grade: added a new test for grade_category::apply_limit_rules() --- lib/grade/tests/grade_category_test.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/grade/tests/grade_category_test.php b/lib/grade/tests/grade_category_test.php index 727e698..e4281a0 100644 --- a/lib/grade/tests/grade_category_test.php +++ b/lib/grade/tests/grade_category_test.php @@ -516,6 +516,21 @@ class grade_category_testcase extends grade_base_testcase { $this->assertEquals(count($grades), 1); $this->assertEquals($grades[$this->grade_items[2]->id], 6); + // MDL-35667 - There was an infinite loop if several items had the same grade and at least one was extra credit + $category = new grade_category(); + $category->droplow = 1; + $category->aggregation = GRADE_AGGREGATE_WEIGHTED_MEAN2; // simple weighted mean + $items[$this->grade_items[1]->id]->aggregationcoef = 1; // Mark grade item 1 as "extra credit" + $grades = array($this->grade_items[0]->id=>1, // 1 out of 110. Should be excluded from aggregation. + $this->grade_items[1]->id=>1, // 1 out of 100. Extra credit. Should be retained. + $this->grade_items[2]->id=>1, // 1 out of 6. Should be retained. + $this->grade_items[4]->id=>1);// 1 out of 100. Should be retained. + $category->apply_limit_rules($grades, $items); + $this->assertEquals(count($grades), 3); + $this->assertEquals($grades[$this->grade_items[1]->id], 1); + $this->assertEquals($grades[$this->grade_items[2]->id], 1); + $this->assertEquals($grades[$this->grade_items[4]->id], 1); + } /** -- 1.7.9.5 From 50675bf5492af688df51311f3cae118e878aadf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Mon, 1 Oct 2012 09:51:12 +0200 Subject: [PATCH 739/903] MDL-35619 fix invalid avatars on other users page --- enrol/locallib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/enrol/locallib.php b/enrol/locallib.php index 41b7337..e923c2e 100644 --- a/enrol/locallib.php +++ b/enrol/locallib.php @@ -766,13 +766,15 @@ class course_enrolment_manager { $users = array(); foreach ($userroles as $userrole) { + $contextid = $userrole->contextid; + unset($userrole->contextid); // This would collide with user avatar. if (!array_key_exists($userrole->id, $users)) { $users[$userrole->id] = $this->prepare_user_for_display($userrole, $extrafields, $now); } $a = new stdClass; $a->role = $roles[$userrole->roleid]->localname; $changeable = ($userrole->component == ''); - if ($userrole->contextid == $this->context->id) { + if ($contextid == $this->context->id) { $roletext = get_string('rolefromthiscourse', 'enrol', $a); } else { $changeable = false; -- 1.7.9.5 From b843f7aee2462fceeca96314a2009267303673f3 Mon Sep 17 00:00:00 2001 From: Jerome Mouneyrac Date: Wed, 26 Sep 2012 14:16:19 +0800 Subject: [PATCH 740/903] MDL-34971 PHPunit test: user/externallib.php --- user/tests/externallib_test.php | 347 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 347 insertions(+) create mode 100644 user/tests/externallib_test.php diff --git a/user/tests/externallib_test.php b/user/tests/externallib_test.php new file mode 100644 index 0000000..53670e98 --- /dev/null +++ b/user/tests/externallib_test.php @@ -0,0 +1,347 @@ +. + +/** + * User external PHPunit tests + * + * @package core_user + * @category external + * @copyright 2012 Jerome Mouneyrac + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @since Moodle 2.4 + */ + +defined('MOODLE_INTERNAL') || die(); + +global $CFG; + +require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +require_once($CFG->dirroot . '/user/externallib.php'); + +class core_user_external_testcase extends externallib_advanced_testcase { + + /** + * Test get_course_user_profiles + */ + public function test_get_course_user_profiles() { + global $USER, $CFG; + + $this->resetAfterTest(true); + + $course = self::getDataGenerator()->create_course(); + $user1 = array( + 'username' => 'usernametest1', + 'idnumber' => 'idnumbertest1', + 'firstname' => 'First Name User Test 1', + 'lastname' => 'Last Name User Test 1', + 'email' => 'usertest1@email.com', + 'address' => '2 Test Street Perth 6000 WA', + 'phone1' => '01010101010', + 'phone2' => '02020203', + 'icq' => 'testuser1', + 'skype' => 'testuser1', + 'yahoo' => 'testuser1', + 'aim' => 'testuser1', + 'msn' => 'testuser1', + 'department' => 'Department of user 1', + 'institution' => 'Institution of user 1', + 'description' => 'This is a description for user 1', + 'descriptionformat' => FORMAT_MOODLE, + 'city' => 'Perth', + 'url' => 'http://moodle.org', + 'country' => 'au' + ); + $user1 = self::getDataGenerator()->create_user($user1); + if (!empty($CFG->usetags)) { + require_once($CFG->dirroot . '/user/editlib.php'); + require_once($CFG->dirroot . '/tag/lib.php'); + $user1->interests = array('Cinema', 'Tennis', 'Dance', 'Guitar', 'Cooking'); + useredit_update_interests($user1, $user1->interests); + } + $user2 = self::getDataGenerator()->create_user(); + + $context = context_course::instance($course->id); + $roleid = $this->assignUserCapability('moodle/user:viewdetails', $context->id); + + // Enrol the users in the course. + // We use the manual plugin. + $enrol = enrol_get_plugin('manual'); + $enrolinstances = enrol_get_instances($course->id, true); + foreach ($enrolinstances as $courseenrolinstance) { + if ($courseenrolinstance->enrol == "manual") { + $instance = $courseenrolinstance; + break; + } + } + $enrol->enrol_user($instance, $user1->id, $roleid); + $enrol->enrol_user($instance, $user2->id, $roleid); + $enrol->enrol_user($instance, $USER->id, $roleid); + + // Call the external function. + $enrolledusers = core_user_external::get_course_user_profiles(array( + array('userid' => $USER->id, 'courseid' => $course->id), + array('userid' => $user1->id, 'courseid' => $course->id), + array('userid' => $user2->id, 'courseid' => $course->id))); + + // Check we retrieve the good total number of enrolled users + no error on capability. + $this->assertEquals(3, count($enrolledusers)); + + // Do the same call as admin to receive all possible fields. + $this->setAdminUser(); + $USER->email = "admin@fakeemail.com"; + + // Call the external function. + $enrolledusers = core_user_external::get_course_user_profiles(array( + array('userid' => $USER->id, 'courseid' => $course->id), + array('userid' => $user1->id, 'courseid' => $course->id), + array('userid' => $user2->id, 'courseid' => $course->id))); + + foreach($enrolledusers as $enrolleduser) { + if ($enrolleduser['username'] == $user1->username) { + $this->assertEquals($user1->idnumber, $enrolleduser['idnumber']); + $this->assertEquals($user1->firstname, $enrolleduser['firstname']); + $this->assertEquals($user1->lastname, $enrolleduser['lastname']); + $this->assertEquals($user1->email, $enrolleduser['email']); + $this->assertEquals($user1->address, $enrolleduser['address']); + $this->assertEquals($user1->phone1, $enrolleduser['phone1']); + $this->assertEquals($user1->phone2, $enrolleduser['phone2']); + $this->assertEquals($user1->icq, $enrolleduser['icq']); + $this->assertEquals($user1->skype, $enrolleduser['skype']); + $this->assertEquals($user1->yahoo, $enrolleduser['yahoo']); + $this->assertEquals($user1->aim, $enrolleduser['aim']); + $this->assertEquals($user1->msn, $enrolleduser['msn']); + $this->assertEquals($user1->department, $enrolleduser['department']); + $this->assertEquals($user1->institution, $enrolleduser['institution']); + $this->assertEquals($user1->description, $enrolleduser['description']); + $this->assertEquals(FORMAT_HTML, $enrolleduser['descriptionformat']); + $this->assertEquals($user1->city, $enrolleduser['city']); + $this->assertEquals($user1->country, $enrolleduser['country']); + $this->assertEquals($user1->url, $enrolleduser['url']); + if (!empty($CFG->usetags)) { + $this->assertEquals(implode(', ', $user1->interests), $enrolleduser['interests']); + } + } + } + } + + /** + * Test create_users + */ + public function test_create_users() { + global $USER, $CFG, $DB; + + $this->resetAfterTest(true); + + $user1 = array( + 'username' => 'usernametest1', + 'password' => 'Moodle2012!', + 'idnumber' => 'idnumbertest1', + 'firstname' => 'First Name User Test 1', + 'lastname' => 'Last Name User Test 1', + 'email' => 'usertest1@email.com', + 'description' => 'This is a description for user 1', + 'city' => 'Perth', + 'country' => 'au' + ); + + $context = context_system::instance(); + $roleid = $this->assignUserCapability('moodle/user:create', $context->id); + + // Call the external function. + $createdusers = core_user_external::create_users(array($user1)); + + // Check we retrieve the good total number of created users + no error on capability. + $this->assertEquals(1, count($createdusers)); + + foreach($createdusers as $createduser) { + $dbuser = $DB->get_record('user', array('id' => $createduser['id'])); + $this->assertEquals($dbuser->username, $user1['username']); + $this->assertEquals($dbuser->idnumber, $user1['idnumber']); + $this->assertEquals($dbuser->firstname, $user1['firstname']); + $this->assertEquals($dbuser->lastname, $user1['lastname']); + $this->assertEquals($dbuser->email, $user1['email']); + $this->assertEquals($dbuser->description, $user1['description']); + $this->assertEquals($dbuser->city, $user1['city']); + $this->assertEquals($dbuser->country, $user1['country']); + } + + // Call without required capability + $this->unassignUserCapability('moodle/user:create', $context->id, $roleid); + $this->setExpectedException('required_capability_exception'); + $createdusers = core_user_external::create_users(array($user1)); + } + + /** + * Test delete_users + */ + public function test_delete_users() { + global $USER, $CFG, $DB; + + $this->resetAfterTest(true); + + $user1 = self::getDataGenerator()->create_user(); + $user2 = self::getDataGenerator()->create_user(); + + // Check the users were correctly created. + $this->assertEquals(2, $DB->count_records_select('user', 'deleted = 0 AND (id = :userid1 OR id = :userid2)', + array('userid1' => $user1->id, 'userid2' => $user2->id))); + + $context = context_system::instance(); + $roleid = $this->assignUserCapability('moodle/user:delete', $context->id); + + // Call the external function. + core_user_external::delete_users(array($user1->id, $user2->id)); + + // Check we retrieve no users + no error on capability. + $this->assertEquals(0, $DB->count_records_select('user', 'deleted = 0 AND (id = :userid1 OR id = :userid2)', + array('userid1' => $user1->id, 'userid2' => $user2->id))); + + // Call without required capability. + $this->unassignUserCapability('moodle/user:delete', $context->id, $roleid); + $this->setExpectedException('required_capability_exception'); + core_user_external::delete_users(array($user1->id, $user2->id)); + } + + /** + * Test get_users_by_id + */ + public function test_get_users_by_id() { + global $USER, $CFG; + + $this->resetAfterTest(true); + + $user1 = array( + 'username' => 'usernametest1', + 'idnumber' => 'idnumbertest1', + 'firstname' => 'First Name User Test 1', + 'lastname' => 'Last Name User Test 1', + 'email' => 'usertest1@email.com', + 'address' => '2 Test Street Perth 6000 WA', + 'phone1' => '01010101010', + 'phone2' => '02020203', + 'icq' => 'testuser1', + 'skype' => 'testuser1', + 'yahoo' => 'testuser1', + 'aim' => 'testuser1', + 'msn' => 'testuser1', + 'department' => 'Department of user 1', + 'institution' => 'Institution of user 1', + 'description' => 'This is a description for user 1', + 'descriptionformat' => FORMAT_MOODLE, + 'city' => 'Perth', + 'url' => 'http://moodle.org', + 'country' => 'au' + ); + $user1 = self::getDataGenerator()->create_user($user1); + if (!empty($CFG->usetags)) { + require_once($CFG->dirroot . '/user/editlib.php'); + require_once($CFG->dirroot . '/tag/lib.php'); + $user1->interests = array('Cinema', 'Tennis', 'Dance', 'Guitar', 'Cooking'); + useredit_update_interests($user1, $user1->interests); + } + $user2 = self::getDataGenerator()->create_user(); + + $context = context_system::instance(); + $roleid = $this->assignUserCapability('moodle/user:viewdetails', $context->id); + + // Call the external function. + $returnedusers = core_user_external::get_users_by_id(array( + $USER->id, $user1->id, $user2->id)); + + // Check we retrieve the good total number of enrolled users + no error on capability. + $this->assertEquals(3, count($returnedusers)); + + // Do the same call as admin to receive all possible fields. + $this->setAdminUser(); + $USER->email = "admin@fakeemail.com"; + + // Call the external function. + $returnedusers = core_user_external::get_users_by_id(array( + $USER->id, $user1->id, $user2->id)); + + foreach($returnedusers as $enrolleduser) { + if ($enrolleduser['username'] == $user1->username) { + $this->assertEquals($user1->idnumber, $enrolleduser['idnumber']); + $this->assertEquals($user1->firstname, $enrolleduser['firstname']); + $this->assertEquals($user1->lastname, $enrolleduser['lastname']); + $this->assertEquals($user1->email, $enrolleduser['email']); + $this->assertEquals($user1->address, $enrolleduser['address']); + $this->assertEquals($user1->phone1, $enrolleduser['phone1']); + $this->assertEquals($user1->phone2, $enrolleduser['phone2']); + $this->assertEquals($user1->icq, $enrolleduser['icq']); + $this->assertEquals($user1->skype, $enrolleduser['skype']); + $this->assertEquals($user1->yahoo, $enrolleduser['yahoo']); + $this->assertEquals($user1->aim, $enrolleduser['aim']); + $this->assertEquals($user1->msn, $enrolleduser['msn']); + $this->assertEquals($user1->department, $enrolleduser['department']); + $this->assertEquals($user1->institution, $enrolleduser['institution']); + $this->assertEquals($user1->description, $enrolleduser['description']); + $this->assertEquals(FORMAT_HTML, $enrolleduser['descriptionformat']); + $this->assertEquals($user1->city, $enrolleduser['city']); + $this->assertEquals($user1->country, $enrolleduser['country']); + $this->assertEquals($user1->url, $enrolleduser['url']); + if (!empty($CFG->usetags)) { + $this->assertEquals(implode(', ', $user1->interests), $enrolleduser['interests']); + } + } + } + } + + /** + * Test update_users + */ + public function test_update_users() { + global $USER, $CFG, $DB; + + $this->resetAfterTest(true); + + $user1 = self::getDataGenerator()->create_user(); + + $user1 = array( + 'id' => $user1->id, + 'username' => 'usernametest1', + 'password' => 'Moodle2012!', + 'idnumber' => 'idnumbertest1', + 'firstname' => 'First Name User Test 1', + 'lastname' => 'Last Name User Test 1', + 'email' => 'usertest1@email.com', + 'description' => 'This is a description for user 1', + 'city' => 'Perth', + 'country' => 'au' + ); + + $context = context_system::instance(); + $roleid = $this->assignUserCapability('moodle/user:update', $context->id); + + // Call the external function. + core_user_external::update_users(array($user1)); + + $dbuser = $DB->get_record('user', array('id' => $user1['id'])); + $this->assertEquals($dbuser->username, $user1['username']); + $this->assertEquals($dbuser->idnumber, $user1['idnumber']); + $this->assertEquals($dbuser->firstname, $user1['firstname']); + $this->assertEquals($dbuser->lastname, $user1['lastname']); + $this->assertEquals($dbuser->email, $user1['email']); + $this->assertEquals($dbuser->description, $user1['description']); + $this->assertEquals($dbuser->city, $user1['city']); + $this->assertEquals($dbuser->country, $user1['country']); + + // Call without required capability. + $this->unassignUserCapability('moodle/user:update', $context->id, $roleid); + $this->setExpectedException('required_capability_exception'); + core_user_external::update_users(array($user1)); + } +} \ No newline at end of file -- 1.7.9.5 From 30c9794aec9bed5f754b62905adf0fb62dcfaffc Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Fri, 28 Sep 2012 12:31:36 +0100 Subject: [PATCH 741/903] MDL-35669 gravatar Provide default image URL to Gravatar --- admin/settings/users.php | 1 + lang/en/admin.php | 2 ++ lib/outputcomponents.php | 17 +++++++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/admin/settings/users.php b/admin/settings/users.php index f317102..232745d 100644 --- a/admin/settings/users.php +++ b/admin/settings/users.php @@ -150,6 +150,7 @@ if ($hassiteconfig 'institution' => new lang_string('institution'), ))); $temp->add(new admin_setting_configcheckbox('enablegravatar', new lang_string('enablegravatar', 'admin'), new lang_string('enablegravatar_help', 'admin'), 0)); + $temp->add(new admin_setting_configtext('gravatardefaulturl', new lang_string('gravatardefaulturl', 'admin'), new lang_string('gravatardefaulturl_help', 'admin'), 'mm')); } $ADMIN->add('roles', $temp); diff --git a/lang/en/admin.php b/lang/en/admin.php index 5d26680..8a6a935 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -551,6 +551,8 @@ $string['googlemapkey3_help'] = 'You need to enter a special key to use Google M $string['gotofirst'] = 'Go to first missing string'; $string['gradebook'] = 'Gradebook'; $string['gradebookroles'] = 'Graded roles'; +$string['gravatardefaulturl'] = 'Gravatar default image URL'; +$string['gravatardefaulturl_help'] = 'Gravatar needs a default image to display if it is unable to find a picture for a given user. Provide a full URL for an image. If you leave this setting empty, Moodle will attempt to use the most appropriate default image for the page you are viewing. Note also that Gravatar has a number of codes which can be used to generate default images.'; $string['gradeexport'] = 'Primary grade export methods'; $string['guestroleid'] = 'Role for guest'; $string['guestroleid_help'] = 'This role is automatically assigned to the guest user. It is also temporarily assigned to not enrolled users that enter the course via guest enrolment plugin.'; diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index a20bd7c..c29ccc2 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -384,12 +384,25 @@ class user_picture implements renderable { // Hash the users email address $md5 = md5(strtolower(trim($this->user->email))); // Build a gravatar URL with what we know. + + // Find the best default image URL we can (MDL-35669) + if (empty($CFG->gravatardefaulturl)) { + $absoluteimagepath = $page->theme->resolve_image_location('u/'.$filename, 'core'); + if (strpos($absoluteimagepath, $CFG->dirroot) === 0) { + $gravatardefault = $CFG->wwwroot . substr($absoluteimagepath, strlen($CFG->dirroot)); + } else { + $gravatardefault = $CFG->wwwroot . '/pix/u/' . $filename . '.png'; + } + } else { + $gravatardefault = $CFG->gravatardefaulturl; + } + // If the currently requested page is https then we'll return an // https gravatar page. if (strpos($CFG->httpswwwroot, 'https:') === 0) { - return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $defaulturl->out(false))); + return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault)); } else { - return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $defaulturl->out(false))); + return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault)); } } -- 1.7.9.5 From ba804c9ea9067ade84b88a8c408f68e9b96c73b9 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 2 Oct 2012 01:19:33 +0200 Subject: [PATCH 742/903] MDL-35669 gravatar Fix secure image urls. --- lib/outputcomponents.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index c29ccc2..5e1cf96 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -400,6 +400,7 @@ class user_picture implements renderable { // If the currently requested page is https then we'll return an // https gravatar page. if (strpos($CFG->httpswwwroot, 'https:') === 0) { + $gravatardefault = str_replace($CFG->wwwroot, $CFG->httpswwwroot, $gravatardefault); // Replace by secure url. return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault)); } else { return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault)); -- 1.7.9.5 From 54dd6ee7504b8bc3b3fbfdc14aa2fc4e6c415975 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 2 Oct 2012 01:33:59 +0200 Subject: [PATCH 743/903] MDL-35669 gravatar amend and complete gravatar tests. --- lib/tests/outputcomponents_test.php | 42 +++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/lib/tests/outputcomponents_test.php b/lib/tests/outputcomponents_test.php index c515888..d5d50bf 100644 --- a/lib/tests/outputcomponents_test.php +++ b/lib/tests/outputcomponents_test.php @@ -126,6 +126,7 @@ class user_picture_testcase extends advanced_testcase { $this->assertEquals('http://www.example.com/moodle', $CFG->wwwroot); $this->assertEquals($CFG->wwwroot, $CFG->httpswwwroot); $this->assertEquals(0, $CFG->enablegravatar); + $this->assertEquals('mm', $CFG->gravatardefaulturl); // create some users $page = new moodle_page(); @@ -197,21 +198,25 @@ class user_picture_testcase extends advanced_testcase { // test gravatar set_config('enablegravatar', 1); - $up2 = new user_picture($user2); - $this->assertEquals('http://www.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=http%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fimage.php%2Fstandard%2Fcore%2F1%2Fu%2Ff2', $up2->get_url($page, $renderer)->out(false)); - - // uploaded image takes precedence before gravatar - $up1 = new user_picture($user1); - $this->assertEquals($CFG->wwwroot.'/pluginfile.php/15/user/icon/standard/f2?rev=11', $up1->get_url($page, $renderer)->out(false)); - // deleted user can not have gravatar $user3->email = 'deleted'; $user3->picture = 0; $up3 = new user_picture($user3); $this->assertEquals($CFG->wwwroot.'/theme/image.php/standard/core/1/u/f2', $up3->get_url($page, $renderer)->out(false)); + // verify defaults to misteryman (mm) + $up2 = new user_picture($user2); + $this->assertEquals('http://www.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=mm', $up2->get_url($page, $renderer)->out(false)); + + // without gravatardefaulturl, verify we pick own file + set_config('gravatardefaulturl', ''); + $up2 = new user_picture($user2); + $this->assertEquals('http://www.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=http%3A%2F%2Fwww.example.com%2Fmoodle%2Fpix%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false)); + // uploaded image takes precedence before gravatar + $up1 = new user_picture($user1); + $this->assertEquals($CFG->wwwroot.'/pluginfile.php/15/user/icon/standard/f2?rev=11', $up1->get_url($page, $renderer)->out(false)); - // https versions + // https version $CFG->httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot); $up1 = new user_picture($user1); @@ -221,7 +226,26 @@ class user_picture_testcase extends advanced_testcase { $this->assertEquals($CFG->httpswwwroot.'/theme/image.php/standard/core/1/u/f2', $up3->get_url($page, $renderer)->out(false)); $up2 = new user_picture($user2); - $this->assertEquals('https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=https%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fimage.php%2Fstandard%2Fcore%2F1%2Fu%2Ff2', $up2->get_url($page, $renderer)->out(false)); + $this->assertEquals('https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=https%3A%2F%2Fwww.example.com%2Fmoodle%2Fpix%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false)); + + // now test gravatar with one theme having own images (afterburner) + $CFG->httpswwwroot = $CFG->wwwroot; + $this->assertTrue(file_exists("$CFG->dirroot/theme/afterburner/config.php")); + set_config('theme', 'afterburner'); + $page = new moodle_page(); + $page->set_url('/user/profile.php'); + $page->set_context(context_system::instance()); + $renderer = $page->get_renderer('core'); + + $up2 = new user_picture($user2); + $this->assertEquals('http://www.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=http%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fafterburner%2Fpix_core%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false)); + + // https version + $CFG->httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot); + + $up2 = new user_picture($user2); + $this->assertEquals('https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?s=35&d=https%3A%2F%2Fwww.example.com%2Fmoodle%2Ftheme%2Fafterburner%2Fpix_core%2Fu%2Ff2.png', $up2->get_url($page, $renderer)->out(false)); + // end of gravatar tests // test themed images set_config('enablegravatar', 0); -- 1.7.9.5 From bda487868e7489475151f43c77c5e3b968256696 Mon Sep 17 00:00:00 2001 From: Jody Steele Date: Wed, 12 Sep 2012 08:06:08 -0700 Subject: [PATCH 744/903] MDL-33933 mod_forum: fix incorrect capability check --- mod/forum/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 9c3e801..7cfb638 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -5322,7 +5322,7 @@ function forum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NUL return (($userfirstpost !== false && (time() - $userfirstpost >= $CFG->maxeditingtime)) || $firstpost->id == $post->id || $post->userid == $user->id || $firstpost->userid == $user->id || - has_capability('mod/forum:viewqandawithoutposting', $modcontext, $user->id, false)); + has_capability('mod/forum:viewqandawithoutposting', $modcontext, $user->id)); } return true; } -- 1.7.9.5 From 8c4fcc0e1a8eedbbed9accfcae4a9b19289469e2 Mon Sep 17 00:00:00 2001 From: Adam Olley Date: Wed, 21 Mar 2012 10:00:16 +1030 Subject: [PATCH 745/903] enrol_manual: Set context correctly in manual enrolment user selector --- enrol/manual/manage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enrol/manual/manage.php b/enrol/manual/manage.php index f7ea7e2..f458a91 100644 --- a/enrol/manual/manage.php +++ b/enrol/manual/manage.php @@ -64,7 +64,7 @@ $PAGE->set_heading($course->fullname); navigation_node::override_active_url(new moodle_url('/enrol/users.php', array('id'=>$course->id))); // Create the user selector objects. -$options = array('enrolid' => $enrolid); +$options = array('enrolid' => $enrolid, 'accesscontext' => $context); $potentialuserselector = new enrol_manual_potential_participant('addselect', $options); $currentuserselector = new enrol_manual_current_participant('removeselect', $options); -- 1.7.9.5 From 5735b5a2ac8881f1bfe23c8510c5c928d295fa2c Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 2 Oct 2012 13:40:53 +0800 Subject: [PATCH 746/903] MDL-35397 Administration: changed link for 'many other contributors' Previously 'many other contributors' was pointing to http://docs.moodle.org/dev/Credits now, it will point to http://moodle.org/dev. --- admin/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/renderer.php b/admin/renderer.php index 3a3c2bd..56c9056 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -470,7 +470,7 @@ class core_admin_renderer extends plugin_renderer_base { $copyrighttext = 'Moodle '. ''.$CFG->release.'
    '. 'Copyright © 1999 onwards, Martin Dougiamas
    '. - 'and many other contributors.
    '. + 'and many other contributors.
    '. 'GNU Public License'; ////////////////////////////////////////////////////////////////////////////////////////////////// -- 1.7.9.5 From 08363c5c8078bd2f5fa863722acb1471293fe8a0 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 2 Oct 2012 14:19:09 +0800 Subject: [PATCH 747/903] MDL-35047 tool_xmldb: Added missing strings for xmldb --- admin/tool/xmldb/lang/en/tool_xmldb.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/tool/xmldb/lang/en/tool_xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php index 7b384b2..c1475be 100644 --- a/admin/tool/xmldb/lang/en/tool_xmldb.php +++ b/admin/tool/xmldb/lang/en/tool_xmldb.php @@ -111,10 +111,13 @@ $string['checkindexes'] = 'Check indexes'; $string['check_indexes'] = 'Look for missing DB indexes'; $string['checkoraclesemantics'] = 'Check semantics'; $string['check_oracle_semantics'] = 'Look for incorrect length semantics'; +$string['duplicateindexname'] = 'Duplicate index name'; $string['incorrectfieldname'] = 'Incorrect name'; $string['index'] = 'Index'; $string['indexes'] = 'Indexes'; +$string['indexnameempty'] = 'Index name is empty'; $string['integerincorrectlength'] = 'Incorrect length for integer field'; +$string['incorrectindexname'] = 'Incorrect index name'; $string['incorrectkeyname'] = 'Incorrect key name'; $string['incorrecttablename'] = 'Incorrect table name'; $string['key'] = 'Key'; -- 1.7.9.5 From bbb553e077501dbb2ecddb676c1e285def796c31 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 2 Oct 2012 14:28:55 +0800 Subject: [PATCH 748/903] MDL-28235 form: Help button popup close accessibility improved AMOS BEGIN CPY [close,editor],[close,form] AMOS END --- lang/en/form.php | 1 + lib/javascript-static.js | 8 ++++++-- lib/outputrenderers.php | 2 ++ theme/base/style/core.css | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lang/en/form.php b/lang/en/form.php index d55667d..d926cd2 100644 --- a/lang/en/form.php +++ b/lang/en/form.php @@ -25,6 +25,7 @@ $string['addfields'] = 'Add {$a} fields to form'; $string['advancedelement'] = 'Advanced element'; +$string['close'] = 'Close'; $string['day'] = 'Day'; $string['display'] = 'Display'; $string['err_alphanumeric'] = 'You must enter only letters or numbers here.'; diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 24ac3fa..cf155e7 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1385,16 +1385,19 @@ M.util.help_icon = { event.preventDefault(); if (M.util.help_icon.instance === null) { var Y = M.util.help_icon.Y; - Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', function(Y) { + Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', 'escape', function(Y) { var help_content_overlay = { helplink : null, overlay : null, init : function() { - var closebtn = Y.Node.create(''); + var strclose = Y.Escape.html(M.str.form.close); + var closebtn = Y.Node.create(''+strclose+''); + var footerbtn = Y.Node.create(''); // Create an overlay from markup this.overlay = new Y.Overlay({ headerContent: closebtn, + footerContent: footerbtn, bodyContent: '', id: 'helppopupbox', width:'400px', @@ -1404,6 +1407,7 @@ M.util.help_icon = { this.overlay.render(Y.one(document.body)); closebtn.on('click', this.overlay.hide, this.overlay); + footerbtn.on('click', this.overlay.hide, this.overlay); var boundingBox = this.overlay.get("boundingBox"); diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index dd03dc8..b49c69b 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1733,6 +1733,7 @@ class core_renderer extends renderer_base { $output = html_writer::tag('a', $output, $attributes); $this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false)))); + $this->page->requires->string_for_js('close', 'form'); // and finally span return html_writer::tag('span', $output, array('class' => 'helplink')); @@ -1798,6 +1799,7 @@ class core_renderer extends renderer_base { $output = html_writer::tag('a', $output, $attributes); $this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false)))); + $this->page->requires->string_for_js('close', 'form'); // and finally span return html_writer::tag('span', $output, array('class' => 'helplink')); diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 3aec3d8..33946cf 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -477,6 +477,8 @@ body.tag .managelink {padding: 5px;} #helppopupbox {background-color: #eee; border: 1px solid #848484;z-index: 10000 !important;} #helppopupbox .yui3-widget-hd {float:right;margin:3px 3px 0 0;} #helppopupbox .yui3-widget-bd {margin:0 1em 1em 1em;border-top:1px solid #eee;} +#helppopupbox .yui3-widget-ft {text-align: center;} +#helppopupbox .yui3-widget-ft .closebtn {margin:0 1em 1em 1em;} #helppopupbox .helpheading {font-size: 1em;} #helppopupbox .spinner {margin:1em;} -- 1.7.9.5 From 80f497ea40ee184ca40bfc97579fc0c9c7e4ba12 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 2 Oct 2012 14:34:15 +0800 Subject: [PATCH 749/903] MDL-28235 form: Removed close icon of help icon popups --- lib/javascript-static.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index cf155e7..653557b 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1392,11 +1392,9 @@ M.util.help_icon = { init : function() { var strclose = Y.Escape.html(M.str.form.close); - var closebtn = Y.Node.create(''+strclose+''); var footerbtn = Y.Node.create(''); // Create an overlay from markup this.overlay = new Y.Overlay({ - headerContent: closebtn, footerContent: footerbtn, bodyContent: '', id: 'helppopupbox', @@ -1406,7 +1404,6 @@ M.util.help_icon = { }); this.overlay.render(Y.one(document.body)); - closebtn.on('click', this.overlay.hide, this.overlay); footerbtn.on('click', this.overlay.hide, this.overlay); var boundingBox = this.overlay.get("boundingBox"); @@ -1423,9 +1420,6 @@ M.util.help_icon = { this.overlay.hide(); } }, this); - - Y.on("key", this.close, closebtn , "down:13", this); - closebtn.on('click', this.close, this); }, close : function(e) { -- 1.7.9.5 From 1a2b3452324ff8ce29aaf46f0c0d769bd01ab39a Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Tue, 2 Oct 2012 14:35:28 +0100 Subject: [PATCH 750/903] MDL-35715 course dragdrop Fix the ability to drag back to the empty section --- course/yui/dragdrop/dragdrop.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/course/yui/dragdrop/dragdrop.js b/course/yui/dragdrop/dragdrop.js index f52497e..bd35bd9 100644 --- a/course/yui/dragdrop/dragdrop.js +++ b/course/yui/dragdrop/dragdrop.js @@ -294,13 +294,13 @@ YUI.add('moodle-course-dragdrop', function(Y) { var resources = Y.Node.create('
      '); resources.addClass(CSS.SECTION); sectionnode.one('.'+CSS.CONTENT+' div.'+CSS.SUMMARY).insert(resources, 'after'); - // 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' - }); } + // 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); -- 1.7.9.5 From db1052ce5cbbab3e35eca8b6d01ff2d6eecb11e3 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Tue, 2 Oct 2012 15:51:45 +0100 Subject: [PATCH 751/903] MDL-35744 quiz: fix review options for Never submitted attempts --- mod/quiz/locallib.php | 2 +- mod/quiz/tests/locallib_test.php | 88 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index fc59804..f55f590 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -987,7 +987,7 @@ function quiz_get_flag_option($attempt, $context) { * IMMEDIATELY_AFTER, LATER_WHILE_OPEN or AFTER_CLOSE constants. */ function quiz_attempt_state($quiz, $attempt) { - if ($attempt->state != quiz_attempt::FINISHED) { + if ($attempt->state == quiz_attempt::IN_PROGRESS) { return mod_quiz_display_options::DURING; } else if (time() < $attempt->timefinish + 120) { return mod_quiz_display_options::IMMEDIATELY_AFTER; diff --git a/mod/quiz/tests/locallib_test.php b/mod/quiz/tests/locallib_test.php index d058b3c..177947c 100644 --- a/mod/quiz/tests/locallib_test.php +++ b/mod/quiz/tests/locallib_test.php @@ -151,4 +151,92 @@ class mod_quiz_locallib_testcase extends basic_testcase { $this->assertEquals(1, quiz_get_slot_for_question($quiz, 1)); $this->assertEquals(3, quiz_get_slot_for_question($quiz, 7)); } + + public function test_quiz_attempt_state_in_progress() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::IN_PROGRESS; + $attempt->timefinish = 0; + + $quiz = new stdClass(); + $quiz->timeclose = 0; + + $this->assertEquals(mod_quiz_display_options::DURING, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_recently_submitted() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::FINISHED; + $attempt->timefinish = time() - 10; + + $quiz = new stdClass(); + $quiz->timeclose = 0; + + $this->assertEquals(mod_quiz_display_options::IMMEDIATELY_AFTER, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_sumitted_quiz_never_closes() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::FINISHED; + $attempt->timefinish = time() - 7200; + + $quiz = new stdClass(); + $quiz->timeclose = 0; + + $this->assertEquals(mod_quiz_display_options::LATER_WHILE_OPEN, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_sumitted_quiz_closes_later() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::FINISHED; + $attempt->timefinish = time() - 7200; + + $quiz = new stdClass(); + $quiz->timeclose = time() + 3600; + + $this->assertEquals(mod_quiz_display_options::LATER_WHILE_OPEN, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_sumitted_quiz_closed() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::FINISHED; + $attempt->timefinish = time() - 7200; + + $quiz = new stdClass(); + $quiz->timeclose = time() - 3600; + + $this->assertEquals(mod_quiz_display_options::AFTER_CLOSE, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_never_sumitted_quiz_never_closes() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::ABANDONED; + $attempt->timefinish = 1000; // A very long time ago! + + $quiz = new stdClass(); + $quiz->timeclose = 0; + + $this->assertEquals(mod_quiz_display_options::LATER_WHILE_OPEN, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_never_sumitted_quiz_closes_later() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::ABANDONED; + $attempt->timefinish = time() - 7200; + + $quiz = new stdClass(); + $quiz->timeclose = time() + 3600; + + $this->assertEquals(mod_quiz_display_options::LATER_WHILE_OPEN, quiz_attempt_state($quiz, $attempt)); + } + + public function test_quiz_attempt_state_never_sumitted_quiz_closed() { + $attempt = new stdClass(); + $attempt->state = quiz_attempt::ABANDONED; + $attempt->timefinish = time() - 7200; + + $quiz = new stdClass(); + $quiz->timeclose = time() - 3600; + + $this->assertEquals(mod_quiz_display_options::AFTER_CLOSE, quiz_attempt_state($quiz, $attempt)); + } } -- 1.7.9.5 From 1c1455f29a47a6c7547e74dc8cae08694a1c07e2 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Mon, 1 Oct 2012 22:46:50 +0200 Subject: [PATCH 752/903] MDL-35723 - Align to center the "Quiz Feedback" label,when in RTL mode --- mod/quiz/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index d07442b..2f8a5b4 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -113,6 +113,7 @@ table.quizattemptsummary .noreviewmessage {color: gray;} #page-mod-quiz-view .generalbox#feedback {width:70%;margin-left:auto;margin-right:auto;padding-bottom:15px;} #page-mod-quiz-view .generalbox#feedback h2 {margin: 0;} #page-mod-quiz-view .generalbox#feedback h3 {text-align: left;} +#page-mod-quiz-view.dir-rtl .generalbox#feedback h3 {text-align: center;} #page-mod-quiz-view .generalbox#feedback .overriddennotice {text-align: center;font-size: 0.7em;} .quizstartbuttondiv.quizsecuremoderequired input { display: none; } .jsenabled .quizstartbuttondiv.quizsecuremoderequired input { display: inline; } -- 1.7.9.5 From 1e5b1d6dad43919b93606682ebf429f64130de1a Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 3 Oct 2012 09:49:01 +0800 Subject: [PATCH 753/903] MDL-35754 libraries: openpopup() does not fail when window name is not set --- lib/javascript-static.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 24ac3fa..4189c37 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1190,9 +1190,12 @@ function openpopup(event, args) { } } - // Cleans window name because IE does not support funky ones. + // Make sure the name argument is set and valid. var nameregex = /[^a-z0-9_]/i; - if (args.name.match(nameregex)) { + if (typeof args.name !== 'string') { + args.name = '_blank'; + } else if (args.name.match(nameregex)) { + // Cleans window name because IE does not support funky ones. args.name = args.name.replace(nameregex, '_'); if (M.cfg.developerdebug) { alert('DEVELOPER NOTICE: Invalid \'name\' passed to openpopup()'); -- 1.7.9.5 From 36c7b8665f4a141b9b0fcb251f58300b7ec8249b Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 3 Oct 2012 11:52:50 +0800 Subject: [PATCH 754/903] MDL-35763: Add ignoredirty class to drop down lists in assignment grading options form. --- mod/assign/gradingoptionsform.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/assign/gradingoptionsform.php b/mod/assign/gradingoptionsform.php index 3e6e54b..b24f4fa 100644 --- a/mod/assign/gradingoptionsform.php +++ b/mod/assign/gradingoptionsform.php @@ -44,16 +44,17 @@ class mod_assign_grading_options_form extends moodleform { function definition() { $mform = $this->_form; $instance = $this->_customdata; + $dirtyclass = array('class'=>'ignoredirty'); $mform->addElement('header', 'general', get_string('gradingoptions', 'assign')); // visible elements $options = array(-1=>get_string('all'),10=>'10', 20=>'20', 50=>'50', 100=>'100'); - $mform->addElement('select', 'perpage', get_string('assignmentsperpage', 'assign'), $options); + $mform->addElement('select', 'perpage', get_string('assignmentsperpage', 'assign'), $options, $dirtyclass); $options = array('' => get_string('filternone', 'assign'), ASSIGN_FILTER_SUBMITTED => get_string('filtersubmitted', 'assign'), ASSIGN_FILTER_REQUIRE_GRADING => get_string('filterrequiregrading', 'assign')); if ($instance['submissionsenabled']) { - $mform->addElement('select', 'filter', get_string('filter', 'assign'), $options); + $mform->addElement('select', 'filter', get_string('filter', 'assign'), $options, $dirtyclass); } // quickgrading -- 1.7.9.5 From 113f51d7c9e52ed8e8921660724cda60342e4c85 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 1 Oct 2012 10:05:22 +0800 Subject: [PATCH 755/903] MDL-35519 mod_book: fixed the cancel import redirect URL --- mod/book/tool/importhtml/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/book/tool/importhtml/index.php b/mod/book/tool/importhtml/index.php index eaae261..25ee6f7 100644 --- a/mod/book/tool/importhtml/index.php +++ b/mod/book/tool/importhtml/index.php @@ -60,9 +60,9 @@ $mform = new booktool_importhtml_form(null, array('id'=>$id, 'chapterid'=>$chapt // If data submitted, then process and store. if ($mform->is_cancelled()) { if (empty($chapter->id)) { - redirect("/mod/book/view.php?id=$cm->id"); + redirect($CFG->wwwroot."/mod/book/view.php?id=$cm->id"); } else { - redirect("/mod/book/view.php?id=$cm->id&chapterid=$chapter->id"); + redirect($CFG->wwwroot."/mod/book/view.php?id=$cm->id&chapterid=$chapter->id"); } } else if ($data = $mform->get_data()) { -- 1.7.9.5 From 1c409bfe80069dbce99cfaeb08efe7f75c4e0869 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 3 Oct 2012 17:03:35 +0800 Subject: [PATCH 756/903] MDL-35634 course: Restored alt attribute on module icons --- course/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/lib.php b/course/lib.php index 955b58c..8081986 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1572,7 +1572,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // Display link itself echo 'extra . $onclick . ' href="' . $url . '"> ' . + '" class="activityicon" alt="' . $modulename . '" /> ' . $accesstext . '' . $instancename . $altname . ''; -- 1.7.9.5 From ea29e3141ad81256c847a4da70f554784f6640f7 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 3 Oct 2012 18:46:07 +0100 Subject: [PATCH 757/903] MDL-35776 user ajax: fix sort order in chrome. It seems that Chrome orders fields of objects in order of array key. Therefore we must stop using user.id in the PHP arrays, and instead ensure that we use sequential numbers. This commit fixes the user selector. Conflicts: user/selector/module.js user/selector/search.php --- user/selector/module.js | 14 ++++++++------ user/selector/search.php | 13 ++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/user/selector/module.js b/user/selector/module.js index de2f500..120fb78 100644 --- a/user/selector/module.js +++ b/user/selector/module.js @@ -221,8 +221,9 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc // Output each optgroup. var count = 0; - for (var groupname in data.results) { - this.output_group(groupname, data.results[groupname], selectedusers, true); + for (var key in data.results) { + var groupdata = data.results[key]; + this.output_group(groupdata.name, groupdata.users, selectedusers, true); count++; } if (!count) { @@ -248,13 +249,14 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc output_group : function(groupname, users, selectedusers, processsingle) { var optgroup = Y.Node.create(''); var count = 0; - for (var userid in users) { - var user = users[userid]; - var option = Y.Node.create(''); + for (var key in users) { + var user = users[key]; + var option = Y.Node.create(''); if (user.disabled) { option.set('disabled', true); - } else if (selectedusers===true || selectedusers[userid]) { + } else if (selectedusers===true || selectedusers[user.id]) { option.set('selected', true); + delete selectedusers[user.id]; } else { option.set('selected', false); } diff --git a/user/selector/search.php b/user/selector/search.php index fcaf74e..ab28274 100644 --- a/user/selector/search.php +++ b/user/selector/search.php @@ -78,17 +78,20 @@ if (isset($options['file'])) { $userselector = new $classname($name, $options); // Do the search and output the results. -$users = $userselector->find_users($search); -foreach ($users as &$group) { - foreach ($group as $user) { +$results = $userselector->find_users($search); +$json = array(); +foreach ($results as $groupname => $users) { + $groupdata = array('name' => $groupname, 'users' => array()); + foreach ($users as $user) { $output = new stdClass; $output->id = $user->id; $output->name = $userselector->output_user($user); if (!empty($user->disabled)) { $output->disabled = true; } - $group[$user->id] = $output; + $groupdata['users'][] = $output; } + $json[] = $groupdata; } -echo json_encode(array('results' => $users)); +echo json_encode(array('results' => $json)); -- 1.7.9.5 From 13815377b59d692a311b86f10bf1a7ae5d199016 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 3 Oct 2012 18:46:07 +0100 Subject: [PATCH 758/903] MDL-35776 user ajax: fix sort order in chrome. It seems that Chrome orders fields of objects in order of array key. Therefore we must stop using user.id in the PHP arrays, and instead ensure that we use sequential numbers. This commit fixes the enrol UI. --- enrol/ajax.php | 8 ++++++-- enrol/manual/ajax.php | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/enrol/ajax.php b/enrol/ajax.php index 8a0bdfc..48b3fca 100644 --- a/enrol/ajax.php +++ b/enrol/ajax.php @@ -54,9 +54,9 @@ echo $OUTPUT->header(); // send headers $manager = new course_enrolment_manager($PAGE, $course); -$outcome = new stdClass; +$outcome = new stdClass(); $outcome->success = true; -$outcome->response = new stdClass; +$outcome->response = new stdClass(); $outcome->error = ''; switch ($action) { @@ -99,6 +99,10 @@ switch ($action) { $user->fullname = fullname($user); unset($user->id); } + // Chrome will display users in the order of the array keys, so we need + // to ensure that the results ordered array keys. Fortunately, the JavaScript + // does not care what the array keys are. It uses user.id where necessary. + $outcome->response['users'] = array_values($outcome->response['users']); $outcome->success = true; break; default: diff --git a/enrol/manual/ajax.php b/enrol/manual/ajax.php index a9d5bb7..b599b95 100644 --- a/enrol/manual/ajax.php +++ b/enrol/manual/ajax.php @@ -53,9 +53,9 @@ echo $OUTPUT->header(); // send headers $manager = new course_enrolment_manager($PAGE, $course); -$outcome = new stdClass; +$outcome = new stdClass(); $outcome->success = true; -$outcome->response = new stdClass; +$outcome->response = new stdClass(); $outcome->error = ''; switch ($action) { @@ -79,6 +79,10 @@ switch ($action) { } $user->extrafields = implode(', ', $fieldvalues); } + // Chrome will display users in the order of the array keys, so we need + // to ensure that the results ordered array keys. Fortunately, the JavaScript + // does not care what the array keys are. It uses user.id where necessary. + $outcome->response['users'] = array_values($outcome->response['users']); $outcome->success = true; break; case 'enrol': @@ -135,4 +139,4 @@ switch ($action) { throw new enrol_ajax_exception('unknowajaxaction'); } -echo json_encode($outcome); \ No newline at end of file +echo json_encode($outcome); -- 1.7.9.5 From 0a1c7a188a6a92b5562dce3306b5f0addfb5f8e8 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 4 Oct 2012 00:35:00 +0000 Subject: [PATCH 759/903] Automatically generated installer lang files --- install/lang/uk/install.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 install/lang/uk/install.php diff --git a/install/lang/uk/install.php b/install/lang/uk/install.php new file mode 100644 index 0000000..c132e32 --- /dev/null +++ b/install/lang/uk/install.php @@ -0,0 +1,34 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['databasehost'] = 'Сервер бази даних'; +$string['databasename'] = 'Ім’я бази даних'; -- 1.7.9.5 From 90c6925bdbd0e401798ee52d4ba16e4847e72c08 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Thu, 4 Oct 2012 15:17:42 +0800 Subject: [PATCH 760/903] MDL-27309 Blocks: command node is taken from dockitem during restore --- blocks/dock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks/dock.js b/blocks/dock.js index 4eff68c..3c8a31b 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -958,7 +958,7 @@ M.core_dock.genericblock.prototype = { placeholder.replace(this.Y.Node.getDOMNode(this.cachedcontentnode)); this.cachedcontentnode = this.Y.one('#'+this.cachedcontentnode.get('id')); - var commands = this.cachedcontentnode.one('.title .commands'); + var commands = dockitem.commands; if (commands) { commands.all('.hidepanelicon').remove(); commands.all('.moveto').remove(); -- 1.7.9.5 From e6b958d4db4ff8c938f5b867b50073f1128a8bb7 Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Wed, 3 Oct 2012 13:42:10 +0100 Subject: [PATCH 761/903] MDL-35767 Fix missing target event group check Prevent interfering between items from different groups (and no groups) --- lib/yui/dragdrop/dragdrop.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/yui/dragdrop/dragdrop.js b/lib/yui/dragdrop/dragdrop.js index f8b664d..0772f18 100644 --- a/lib/yui/dragdrop/dragdrop.js +++ b/lib/yui/dragdrop/dragdrop.js @@ -167,6 +167,10 @@ YUI.add('moodle-core-dragdrop', function(Y) { // this.lastdroptarget (ghost node we use for indicating where to drop) e.drag = e.target; e.drop = this.lastdroptarget; + // Check that drag object belongs to correct group + if (!this.in_group(e.drag)) { + return; + } // Check that drop object belong to correct group if (!e.drop || !e.drop.inGroup(this.groups)) { return; -- 1.7.9.5 From d1085311c91b95f49e4b0f6f6732febc91677ce1 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Thu, 4 Oct 2012 17:25:45 +0800 Subject: [PATCH 762/903] MDL-32218 Blocks: allowblockstodock is also checked for region dock status --- lib/blocklib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/blocklib.php b/lib/blocklib.php index 47885c9..9413201 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -454,7 +454,9 @@ class block_manager { * @return bool True if all of the blocks within that region are docked */ public function region_completely_docked($region, $output) { - if (!$this->page->theme->enable_dock) { + global $CFG; + // If theme doesn't allow docking or allowblockstodock is not set, then return. + if (!$this->page->theme->enable_dock || empty($CFG->allowblockstodock)) { return false; } -- 1.7.9.5 From 5c3cb55b5dd144d5df093c7f9ef7cce79930cdc4 Mon Sep 17 00:00:00 2001 From: sam marshall Date: Wed, 29 Aug 2012 16:31:55 +0100 Subject: [PATCH 763/903] MDL-34228 Completion: Add capability that controls if a user is shown in reports --- lang/en/role.php | 1 + lib/completionlib.php | 3 ++- lib/db/access.php | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lang/en/role.php b/lang/en/role.php index ffbdec3..f9ab6a9 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -121,6 +121,7 @@ $string['course:changesummary'] = 'Change course summary'; $string['course:enrolconfig'] = 'Configure enrol instances in courses'; $string['course:enrolreview'] = 'Review course enrolments'; $string['course:ignorefilesizelimits'] = 'Use files larger than any file size restrictions'; +$string['course:isincompletionreports'] = 'Be shown on completion reports'; $string['course:manageactivities'] = 'Manage activities'; $string['course:managefiles'] = 'Manage files'; $string['course:managegrades'] = 'Manage grades'; diff --git a/lib/completionlib.php b/lib/completionlib.php index fcd5910..fcc6f58 100644 --- a/lib/completionlib.php +++ b/lib/completionlib.php @@ -1069,7 +1069,8 @@ class completion_info { global $DB; list($enrolledsql, $params) = get_enrolled_sql( - context_course::instance($this->course->id), '', $groupid, true); + context_course::instance($this->course->id), + 'moodle/course:isincompletionreports', $groupid, true); $sql = 'SELECT u.id, u.firstname, u.lastname, u.idnumber'; if ($extracontext) { diff --git a/lib/db/access.php b/lib/db/access.php index 121750c..f2027df 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -979,6 +979,14 @@ $capabilities = array( ) ), + 'moodle/course:isincompletionreports' => array( + 'captype' => 'read', + 'contextlevel' => CONTEXT_COURSE, + 'archetypes' => array( + 'student' => CAP_ALLOW, + ), + ), + 'moodle/course:viewscales' => array( 'captype' => 'read', -- 1.7.9.5 From 5747c6bccd134e9982f15e4e1e5d0fa11f02ba06 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Thu, 4 Oct 2012 13:04:27 +0800 Subject: [PATCH 764/903] MDL-33646 book: Adding a notice instead of error when there is no content in the book --- mod/book/lang/en/book.php | 1 + mod/book/view.php | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mod/book/lang/en/book.php b/mod/book/lang/en/book.php index 470e18e..e15de10 100644 --- a/mod/book/lang/en/book.php +++ b/mod/book/lang/en/book.php @@ -47,6 +47,7 @@ $string['editingchapter'] = 'Editing chapter'; $string['chaptertitle'] = 'Chapter title'; $string['content'] = 'Content'; $string['subchapter'] = 'Subchapter'; +$string['nocontent'] = 'No content has been added to this book yet.'; $string['numbering'] = 'Chapter formatting'; $string['numbering_help'] = '* None - Chapter and subchapter titles have no formatting * Numbers - Chapters and subchapter titles are numbered 1, 1.1, 1.2, 2, ... diff --git a/mod/book/view.php b/mod/book/view.php index 91b83b8..6b9365d 100644 --- a/mod/book/view.php +++ b/mod/book/view.php @@ -87,13 +87,16 @@ if ($chapterid == '0') { // Go to first chapter if no given. } } -if (!$chapterid or !$chapter = $DB->get_record('book_chapters', array('id'=>$chapterid, 'bookid'=>$book->id))) { - print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id))); -} +$courseurl = new moodle_url('/course/view.php', array('id' => $course->id)); -// chapter is hidden for students -if ($chapter->hidden and !$viewhidden) { - print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id))); +// No content in the book. +if (!$chapterid) { + $PAGE->set_url('/mod/book/view.php', array('id' => $id)); + notice(get_string('nocontent', 'mod_book'), $courseurl->out(false)); +} +// Chapter doesnt exist or it is hidden for students +if ((!$chapter = $DB->get_record('book_chapters', array('id' => $chapterid, 'bookid' => $book->id))) or ($chapter->hidden and !$viewhidden)) { + print_error('errorchapter', 'mod_book', $courseurl); } $PAGE->set_url('/mod/book/view.php', array('id'=>$id, 'chapterid'=>$chapterid)); -- 1.7.9.5 From 8cfc92afddefd66d01e5efff2579303b1dc52cda Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Thu, 13 Sep 2012 12:30:32 +0800 Subject: [PATCH 765/903] MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal --- course/view.php | 5 +++++ lib/navigationlib.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/course/view.php b/course/view.php index cb978d8..18f0313 100644 --- a/course/view.php +++ b/course/view.php @@ -20,6 +20,7 @@ $marker = optional_param('marker',-1 , PARAM_INT); $switchrole = optional_param('switchrole',-1, PARAM_INT); $modchooser = optional_param('modchooser', -1, PARAM_BOOL); + $return = optional_param('return', 0, PARAM_LOCALURL); $params = array(); if (!empty($name)) { @@ -139,6 +140,8 @@ // Redirect to site root if Editing is toggled on frontpage if ($course->id == SITEID) { redirect($CFG->wwwroot .'/?redirect=0'); + } else if (!empty($return)) { + redirect($CFG->wwwroot . $return); } else { $url = new moodle_url($PAGE->url, array('notifyeditingon' => 1)); redirect($url); @@ -152,6 +155,8 @@ // Redirect to site root if Editing is toggled on frontpage if ($course->id == SITEID) { redirect($CFG->wwwroot .'/?redirect=0'); + } else if (!empty($return)) { + redirect($CFG->wwwroot . $return); } else { redirect($PAGE->url); } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index b24c112..dcf466a 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3561,7 +3561,7 @@ class settings_navigation extends navigation_node { $baseurl->param('sesskey', sesskey()); } else { // Edit on the main course page. - $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'sesskey'=>sesskey())); + $baseurl = new moodle_url('/course/view.php', array('id'=>$course->id, 'return'=>$this->page->url->out_as_local_url(false), 'sesskey'=>sesskey())); } $editurl = clone($baseurl); -- 1.7.9.5 From 077fde5dc5ccaef92170979a2024f31813ad3295 Mon Sep 17 00:00:00 2001 From: Jenny Gray Date: Wed, 3 Oct 2012 09:27:36 +0100 Subject: [PATCH 766/903] MDL-35694 logs: extend course log report downloads with action url --- course/lib.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/course/lib.php b/course/lib.php index ac7a957..460817c 100644 --- a/course/lib.php +++ b/course/lib.php @@ -531,7 +531,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC", function print_log_csv($course, $user, $date, $order='l.time DESC', $modname, $modid, $modaction, $groupid) { - global $DB; + global $DB, $CFG; $text = get_string('course')."\t".get_string('time')."\t".get_string('ip_address')."\t". get_string('fullnameuser')."\t".get_string('action')."\t".get_string('info'); @@ -600,6 +600,8 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname, $firstField = format_string($courses[$log->course], true, array('context' => $coursecontext)); $fullname = fullname($log, has_capability('moodle/site:viewfullnames', $coursecontext)); $row = array($firstField, userdate($log->time, $strftimedatetime), $log->ip, $fullname, $log->module.' '.$log->action, $log->info); + $actionurl = $CFG->wwwroot. make_log_url($log->module,$log->url); + $row = array($firstField, userdate($log->time, $strftimedatetime), $log->ip, $fullname, $log->module.' '.$log->action.' ('.$actionurl.')', $log->info); $text = implode("\t", $row); echo $text." \n"; } @@ -710,7 +712,8 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname, $myxls->write($row, 2, $log->ip, ''); $fullname = fullname($log, has_capability('moodle/site:viewfullnames', $coursecontext)); $myxls->write($row, 3, $fullname, ''); - $myxls->write($row, 4, $log->module.' '.$log->action, ''); + $actionurl = $CFG->wwwroot. make_log_url($log->module,$log->url); + $myxls->write($row, 4, $log->module.' '.$log->action.' ('.$actionurl.')', ''); $myxls->write($row, 5, $log->info, ''); $row++; @@ -823,7 +826,8 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname, $myxls->write_string($row, 2, $log->ip); $fullname = fullname($log, has_capability('moodle/site:viewfullnames', $coursecontext)); $myxls->write_string($row, 3, $fullname); - $myxls->write_string($row, 4, $log->module.' '.$log->action); + $actionurl = $CFG->wwwroot. make_log_url($log->module,$log->url); + $myxls->write_string($row, 4, $log->module.' '.$log->action.' ('.$actionurl.')'); $myxls->write_string($row, 5, $log->info); $row++; -- 1.7.9.5 From db8e84ae1a81508dc55e705cc82489e41e495141 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 5 Oct 2012 16:20:52 +0800 Subject: [PATCH 767/903] Revert "MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability" This reverts commit 60b6b6280b8d9b3f7fdab93dc9dde9a2ca4a24e5. --- grade/report/user/lib.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index a952b33..cd2e951 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -228,26 +228,6 @@ class grade_report_user extends grade_report { } $count = 1; foreach ($element['children'] as $key=>$child) { - - $grade_object = $child['object']; - // If grade object isn't hidden - if ($grade_object->hidden != 1) { - - // If grade object is an module instance - if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) { - - $instances = $this->gtree->modinfo->get_instances(); - // If we can find the module instance - if (!empty($instances[$grade_object->itemmodule][$grade_object->iteminstance])) { - - $cm = $instances[$grade_object->itemmodule][$grade_object->iteminstance]; - // Skip generating rowspans if the user cannot see the module instance - if (!$cm->uservisible) { - continue; - } - } - } - } $count += $this->inject_rowspans($element['children'][$key]); } $element['rowspan'] = $count; -- 1.7.9.5 From 4abc5a1a2c2755d9f7ea60e7ae53d2f2007e33c5 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 5 Oct 2012 13:10:06 +0200 Subject: [PATCH 768/903] Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues." This reverts commit d205afe662ba306833a525d87714d1994467dba7. --- mod/quiz/attempt.php | 4 ++-- mod/quiz/review.php | 3 +-- mod/quiz/summary.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 1cbda08..135ae14 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -76,9 +76,8 @@ if ($attemptobj->is_finished()) { // Check the access rules. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); -$output = $PAGE->get_renderer('mod_quiz'); $messages = $accessmanager->prevent_access(); +$output = $PAGE->get_renderer('mod_quiz'); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -121,6 +120,7 @@ $title = get_string('attempt', 'quiz', $attemptobj->get_attempt_number()); $headtags = $attemptobj->get_html_head_contributions($page); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); if ($attemptobj->is_last_page($page)) { $nextpage = -1; diff --git a/mod/quiz/review.php b/mod/quiz/review.php index eacc703..c19afaa 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -52,8 +52,6 @@ $attemptobj->check_review_capability(); // Create an object to manage all the other (non-roles) access rules. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); - $options = $attemptobj->get_display_options(true); // Check permissions. @@ -105,6 +103,7 @@ if ($attemptobj->is_preview_user() && $attemptobj->is_own_attempt()) { $headtags = $attemptobj->get_html_head_contributions($page, $showall); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); // Summary table start. ============================================================================ diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index 822e307..303638f 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -52,9 +52,8 @@ if ($attemptobj->is_preview_user()) { // Check access. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); -$output = $PAGE->get_renderer('mod_quiz'); $messages = $accessmanager->prevent_access(); +$output = $PAGE->get_renderer('mod_quiz'); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -90,6 +89,7 @@ $PAGE->blocks->add_fake_block($navbc, reset($regions)); $PAGE->navbar->add(get_string('summaryofattempt', 'quiz')); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); // Display the page. echo $output->summary_page($attemptobj, $displayoptions); -- 1.7.9.5 From 562dbe408e7f32afc8c7cac8b05b2d0a261c4b28 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 5 Oct 2012 13:38:50 +0200 Subject: [PATCH 769/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 48fc6b2..a5b0b9a 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.04; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.05; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20120927)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20121005)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From eccf42746c99425ccd4ec4990f5de48ad6d4fcdd Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Fri, 5 Oct 2012 17:12:11 +0100 Subject: [PATCH 770/903] MDL-35395 formslib: a method to disable formchangechecker for a form. --- lib/formslib.php | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/lib/formslib.php b/lib/formslib.php index 23f65cb..c81dfb7 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -1279,6 +1279,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { /** @var bool Whether to display advanced elements (on page load) */ var $_showAdvanced = null; + /** @var bool whether to automatically initialise M.formchangechecker for this form. */ + protected $_use_form_change_checker = true; + /** * The form name is derived from the class name of the wrapper minus the trailing form * It is a name with words joined by underscores whereas the id attribute is words joined by underscores. @@ -1406,8 +1409,32 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { return $this->_showAdvanced; } + /** + * Call this method if you don't want the formchangechecker JavaScript to be + * automatically initialised for this form. + */ + public function disable_form_change_checker() { + $this->_use_form_change_checker = false; + } - /** + /** + * If you have called {@link disable_form_change_checker()} then you can use + * this method to re-enable it. It is enabled by default, so normally you don't + * need to call this. + */ + public function enable_form_change_checker() { + $this->_use_form_change_checker = true; + } + + /** + * @return bool whether this form should automatically initialise + * formchangechecker for itself. + */ + public function is_form_change_checker_enabled() { + return $this->_use_form_change_checker; + } + + /** * Accepts a renderer * * @param HTML_QuickForm_Renderer $renderer An HTML_QuickForm_Renderer object @@ -2312,13 +2339,15 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ $this->_hiddenHtml .= $form->_pageparams; } - $PAGE->requires->yui_module('moodle-core-formchangechecker', - 'M.core_formchangechecker.init', - array(array( - 'formid' => $form->getAttribute('id') - )) - ); - $PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle'); + if ($form->is_form_change_checker_enabled()) { + $PAGE->requires->yui_module('moodle-core-formchangechecker', + 'M.core_formchangechecker.init', + array(array( + 'formid' => $form->getAttribute('id') + )) + ); + $PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle'); + } } /** -- 1.7.9.5 From 33b59af020dbf90e8bb224d64fea184bf6e0d6cc Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 6 Oct 2012 01:31:19 +0100 Subject: [PATCH 771/903] MDL-35231 theme_serenity: fixed misalignment and styling of mod/assignment/action/edit by updating custommenu css in theme/serenity/style/core.css --- theme/serenity/style/core.css | 157 ++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/theme/serenity/style/core.css b/theme/serenity/style/core.css index f57325a..31ea104 100644 --- a/theme/serenity/style/core.css +++ b/theme/serenity/style/core.css @@ -16,34 +16,34 @@ html { background: none; } -body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { +body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: Georgia, "Times New Roman", Times, serif; color: #2a2513; } -#wrapper { +#wrapper { background: #fff; margin: 2% 5%; padding: 5px; border: 1px solid #c1bc9d; } -a { +a { color: #336699; } -a:hover { +a:hover { text-decoration: underline; } -.pagelayout-frontpage #page-content #region-main-box #region-post-box { +.pagelayout-frontpage #page-content #region-main-box #region-post-box { padding-top: 0; } /* Header ------------------------*/ -#page-header { +#page-header { background: #ddd6cc url([[pix:theme|header_grass]]) repeat-x 0 100%; margin-bottom: 5px; } @@ -52,7 +52,7 @@ a:hover { margin-bottom: 0px; } -.headermain { +.headermain { font-weight: normal; margin: 1em 0.5em 0.75em; } @@ -67,10 +67,10 @@ a:hover { float:none; } -/* Navbar +/* Navbar -------------------------*/ -.navbar { +.navbar { background: #aeb9c6 url([[pix:theme|breadcrumb]]) repeat-x 0 100%; padding: 5px; } @@ -78,21 +78,21 @@ a:hover { /* Blocks -------------------------*/ -.block { +.block { border-color: #eee; } -.block .header { +.block .header { background: #9eb1bf; padding-left: 5px; } -.block .title { +.block .title { background: #867f6a; padding-left: 5px; } -.block .title h2 { +.block .title h2 { background: #6e6855; margin: 0; padding: 5px; @@ -100,24 +100,24 @@ a:hover { color: #fff; } -.block_action { +.block_action { padding: 5px 0 0; } -.block .content { +.block .content { background: #d8d2c6; border: 1px solid #867f6a; } .block .minicalendar td, -.block .minicalendar th { +.block .minicalendar th { border-color: #d8d2c6; } /* Course ----------------------------*/ -.headingblock { +.headingblock { background: url([[pix:theme|headingblock]]) repeat-x 0 0; color: #fff; font-weight: normal; @@ -142,10 +142,10 @@ a:hover { background: #fff; } -/* Forums +/* Forums -----------------------------*/ -.forumpost .topic { +.forumpost .topic { background: #cad5e1; border-width: 1px; border-color: #eee #eee #aaa; @@ -158,11 +158,11 @@ a:hover { } -.forumpost .starter .subject { +.forumpost .starter .subject { font-weight: bold; } -.forumpost .content { +.forumpost .content { border-color: #eee; border-width: 0 1px 1px; border-style: solid; @@ -172,56 +172,56 @@ a:hover { /* Dock -----------------------------*/ -body.has_dock { +body.has_dock { margin: 0; } -#dock { +#dock { left: 5%; margin-left: -29px; border-width: 0; background-color: transparent; } -#dock .controls { +#dock .controls { bottom: auto; background-color: #DDD6CC; } -#dock .dockeditem_container { +#dock .dockeditem_container { position: relative; } -#dock .dockeditem.firstdockitem { +#dock .dockeditem.firstdockitem { margin-top: 50px; } -#dock .dockeditem { +#dock .dockeditem { background-color: #fff; padding: 2px; padding-right: 0px; } -#dock .dockedtitle { +#dock .dockedtitle { border-width: 0; } -#dock .dockedtitle h2 { +#dock .dockedtitle h2 { margin: 0; padding: 10px 3px; } -#dock .dockedtitle.activeitem { +#dock .dockedtitle.activeitem { background-color: #817b65; width: 35px; } -#dockeditempanel { +#dockeditempanel { background-color: #817b65; margin-left: 5px; } -#dockeditempanel .dockeditempanel_content { +#dockeditempanel .dockeditempanel_content { background-color: #eee9e0; margin: 0 3px; position: relative; @@ -230,78 +230,77 @@ body.has_dock { border-color: #6f6856; } -#dockeditempanel .dockeditempanel_hd { +#dockeditempanel .dockeditempanel_hd { background-image: url([[pix:theme|headingblock]]); border-width: 0; } -#dockeditempanel .dockeditempanel_hd h2 { +#dockeditempanel .dockeditempanel_hd h2 { font-size: 1em; color: #fff; } /*cutom menu */ /*YUI Reset */ -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible {background-position: -10000px -10000px;} -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label, -.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em {background-position: right center;} -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle {background-position: 3px center;} -.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle {background-position: 0% 50%;} - +#custommenu .yui3-menu-horizontal .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menu-label-active, +#custommenu .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label-menuvisible { + background-position: -10000px -10000px; +} +#custommenu .yui3-menu-label, +#custommenu .yui3-menu .yui3-menu .yui3-menu-label, +#custommenu .yui3-menubuttonnav .yui3-menu-label em { + background-position: right center; +} +#custommenu .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { + background-position: 3px center; +} +#custommenu .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { + background-position: 0% 50%; +} #custommenu { clear: both; background-image: url([[pix:theme|headingblock]]); margin-bottom: 5px; } - -.yui3-skin-sam #page .yui3-menu-label, -.yui3-skin-sam #page .yui3-menuitem-content { +#custommenu .yui3-menu-label, +#custommenu .yui3-menuitem-content { color: #fff; font-weight: 800; line-height: 30px; } - -.custom_menu_submenu .yui3-menu-label, -.custom_menu_submenu .yui3-menuitem-content { - color: #000 !important; - text-shadow: none !important; +#custommenu .custom_menu_submenu .yui3-menu-label, +#custommenu .custom_menu_submenu .yui3-menuitem-content { + color: #333; + text-shadow: none; line-height: 25px; } - -.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, -.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-menuvisible, -.yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content { +#custommenu .yui3-menu-label.yui3-menu-label-active, +#custommenu .yui3-menu-label.yui3-menu-label-menuvisible, +#custommenu .yui3-menuitem-active .yui3-menuitem-content { color: #000; background-color: #d8d2c6; } - -.yui3-skin-sam #page .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content { - border: none !important; +#custommenu .yui3-menu-content, +#custommenu .yui3-menu-content, +#custommenu .yui3-menu .yui3-menu .yui3-menu-content, +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menuitem-content { + border: 0 none; } - -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { - border-color:#808080; - border-style:solid; - border-width:0px 0; +#custommenu .yui3-menu-horizontal .yui3-menu-label, +#custommenu .yui3-menu-horizontal .yui3-menuitem-content { + border: 0 none; } - -#page .custom_menu_submenu { - border: 2px solid #d8d2c6 !important; +#custommenu .custom_menu_submenu { + border: 2px solid #d8d2c6; background: #fff; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; -webkit-box-shadow: 0px 1px 3px #ccc; - -moz-box-shadow: 0px 1px 3px #ccc; - box-shadow: 0px 1px 3px #ccc; -} \ No newline at end of file + -moz-box-shadow: 0px 1px 3px #ccc; + box-shadow: 0px 1px 3px #ccc; +} -- 1.7.9.5 From 7c6d4ed0a7e3073163d8073142e0d84596aa31aa Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Sat, 6 Oct 2012 00:34:00 +0000 Subject: [PATCH 772/903] Automatically generated installer lang files --- install/lang/he/error.php | 4 ++-- install/lang/he/install.php | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/install/lang/he/error.php b/install/lang/he/error.php index 6a2e548..fe6d20a 100644 --- a/install/lang/he/error.php +++ b/install/lang/he/error.php @@ -33,13 +33,13 @@ defined('MOODLE_INTERNAL') || die(); $string['cannotcreatelangdir'] = 'לא ניתן ליצור סיפריית שפה.'; $string['cannotcreatetempdir'] = 'לא ניתן ליצור סיפרייה זמנית.'; $string['cannotdownloadcomponents'] = 'לא ניתן להוריד רכיבים.'; -$string['cannotdownloadzipfile'] = 'לא ניתן להוריד קובץ ZIP.'; +$string['cannotdownloadzipfile'] = 'לא ניתן להוריד קובץ 7Zip'; $string['cannotfindcomponent'] = 'הרכיב לא נמצא.'; $string['cannotsavemd5file'] = 'לא ניתן לשמור קובץ md5.'; $string['cannotsavezipfile'] = 'לא ניתן לשמור קובץ ZIP.'; $string['cannotunzipfile'] = 'לא ניתן לפתוח את קובץ ה-ZIP.'; $string['componentisuptodate'] = 'הרכיב מעודכן.'; -$string['downloadedfilecheckfailed'] = 'נכשלה בדיקת הקובץ המורד.'; +$string['downloadedfilecheckfailed'] = 'הקובץ אשר ירד נמצא שגוי'; $string['invalidmd5'] = 'md5 לא חוקי'; $string['missingrequiredfield'] = 'חסר שדה נדרש כלשהו'; $string['remotedownloaderror'] = 'הורדת הרכיב לשרת שלך כשלה, אנא וודא את הגדרות ה-proxy שלך. תוספת PHP cURL מומלצת מאוד להתקנה. diff --git a/install/lang/he/install.php b/install/lang/he/install.php index d6cb0ae..52508ae 100644 --- a/install/lang/he/install.php +++ b/install/lang/he/install.php @@ -101,11 +101,9 @@ $string['welcomep40'] = 'החבילה כוללת בנוסף $string['welcomep50'] = 'השימוש בכל היישומים בחבילה זו מפוקח ע"י הרשיונות המתאימים להם. החבילה {$a->installername} השלמה היא - קוד פתוח - -והיא מבוזרת תחת רישיון - -href="http://www.gnu.org/copyleft/gpl.html">GPL'; +קוד פתוח +והיא מופצת תחת רשיון +GPL'; $string['welcomep60'] = 'העמודים הבאים יובילו אותך בצורה פשוטה דרך כמה צעדים לעיצוב הגדרות Moodle במחשבך. תוכל לאשר את הגדרות ברירת המחדל או, באפשרותך, לשנותם לפי צרכיך.'; $string['welcomep70'] = 'הקש על לחצן ה"המשך" למטה כדי להמשיך עם הגדרת ה-Moodle'; -- 1.7.9.5 From 2104c9fdc36fcde4f4c35352257c53fed011cf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 2 Oct 2012 13:35:32 +0200 Subject: [PATCH 773/903] MDL-35714 run gc before test reset --- lib/phpunit/classes/util.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index b580259..3534ef8 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -544,6 +544,9 @@ class phpunit_util { public static function reset_all_data($logchanges = false) { global $DB, $CFG, $USER, $SITE, $COURSE, $PAGE, $OUTPUT, $SESSION, $GROUPLIB_CACHE; + // Release memory and indirectly call destroy() methods to release resource handles, etc. + gc_collect_cycles(); + // reset global $DB in case somebody mocked it $DB = self::get_global_backup('DB'); -- 1.7.9.5 From f31ee1292a621477c3a0c6766603b3b4f92ccbaf Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 6 Oct 2012 13:27:04 +0200 Subject: [PATCH 774/903] MDL-35382 fix random course test failures --- course/tests/courselib_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php index 42b8057..acf5963 100644 --- a/course/tests/courselib_test.php +++ b/course/tests/courselib_test.php @@ -36,7 +36,7 @@ class courselib_testcase extends advanced_testcase { $course = $this->getDataGenerator()->create_course(array('numsections'=>10), array('createsections'=>true)); $oldsections = array(); $sections = array(); - foreach ($DB->get_records('course_sections', array('course'=>$course->id)) as $section) { + foreach ($DB->get_records('course_sections', array('course'=>$course->id), 'id') as $section) { $oldsections[$section->section] = $section->id; $sections[$section->id] = $section->section; } -- 1.7.9.5 From 26d2edcc82c2cd30f01f4207845f74b572d7caea Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Wed, 5 Sep 2012 17:54:26 +0300 Subject: [PATCH 775/903] MDL-35245 - Missing scrollbar in Activity Chooser, when in RTL mode --- theme/base/style/core.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 3aec3d8..4a5151b 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -905,6 +905,9 @@ sup {vertical-align: super;} -webkit-box-shadow: inset 0px 0px 30px 0px #CCCCCC; -moz-box-shadow: inset 0px 0px 30px 0px #CCCCCC; } +.dir-rtl.jsenabled .choosercontainer #chooseform .alloptions { + max-width: 18.3em; +} /* Settings for option rows and option subtypes */ .choosercontainer #chooseform .moduletypetitle, -- 1.7.9.5 From 6f0f18a4d46dbcb6ad302b5fb30df2738a8391fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 6 Oct 2012 19:26:37 +0200 Subject: [PATCH 776/903] MDL-35839 fix invalid enrol instance delete cleanup --- lib/enrollib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/enrollib.php b/lib/enrollib.php index b6736c4..bb609fc 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -1626,7 +1626,7 @@ abstract class enrol_plugin { $participants->close(); // now clean up all remainders that were not removed correctly - $DB->delete_records('role_assignments', array('itemid'=>$instance->id, 'component'=>$name)); + $DB->delete_records('role_assignments', array('itemid'=>$instance->id, 'component'=>'enrol_'.$name)); $DB->delete_records('user_enrolments', array('enrolid'=>$instance->id)); // finally drop the enrol row -- 1.7.9.5 From e9c9610f8b06ba9b5b73fa918cf83b49ebc987ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sun, 7 Oct 2012 21:03:44 +0200 Subject: [PATCH 777/903] MDL-35739 show langs on separate lines in CLI installer This fixes column width issues and compatibility with RTL languages. --- admin/cli/install.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/admin/cli/install.php b/admin/cli/install.php index 79ff0b7..38aa06e 100644 --- a/admin/cli/install.php +++ b/admin/cli/install.php @@ -240,18 +240,8 @@ echo get_string('cliinstallheader', 'install', $CFG->target_release)."\n"; if ($interactive) { cli_separator(); $languages = get_string_manager()->get_list_of_translations(); - // format the langs nicely - 3 per line - $c = 0; - $langlist = ''; - foreach ($languages as $key=>$lang) { - $c++; - $length = iconv_strlen($lang, 'UTF-8'); - $padded = $lang.str_repeat(' ', 38-$length); - $langlist .= $padded; - if ($c % 3 == 0) { - $langlist .= "\n"; - } - } + // Do not put the langs into columns because it is not compatible with RTL. + $langlist = implode("\n", $languages); $default = $CFG->lang; cli_heading(get_string('availablelangs', 'install')); echo $langlist."\n"; -- 1.7.9.5 From 77957668cc9038021f35baff3186cfba9b509988 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 4 Oct 2012 16:40:26 +1300 Subject: [PATCH 778/903] MDL-26348 tool_customlang: Fixed up SQL causing issues in Oracle --- admin/tool/customlang/locallib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/tool/customlang/locallib.php b/admin/tool/customlang/locallib.php index 47bbdfa..878eb4c 100644 --- a/admin/tool/customlang/locallib.php +++ b/admin/tool/customlang/locallib.php @@ -488,7 +488,7 @@ class tool_customlang_translator implements renderable { list($insql, $inparams) = $DB->get_in_or_equal($filter->component, SQL_PARAMS_NAMED); $csql = "SELECT COUNT(*)"; - $fsql = "SELECT s.id, s.*, c.name AS component"; + $fsql = "SELECT s.*, c.name AS component"; $sql = " FROM {tool_customlang_components} c JOIN {tool_customlang} s ON s.componentid = c.id WHERE s.lang = :lang -- 1.7.9.5 From 67728fe717de8095c3ac61a3cf2251dd6b1ad9c5 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Wed, 3 Oct 2012 15:53:16 +0200 Subject: [PATCH 779/903] MDL-30754: Make sure to always display breadcrumbs when browsing categories. --- lib/navigationlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index b24c112..9ba6f13 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1197,7 +1197,7 @@ class global_navigation extends navigation_node { break; case CONTEXT_COURSECAT : // This has already been loaded we just need to map the variable - if ($showcategories) { + if ($this->show_categories()) { $this->load_all_categories($this->page->context->instanceid, true); } break; -- 1.7.9.5 From f062a78344d90365f1f9b3b9c9080f10173ca929 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 8 Oct 2012 09:45:27 +1300 Subject: [PATCH 780/903] MDL-32326 dock: Clarified use of CSS rotation --- blocks/dock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks/dock.js b/blocks/dock.js index 4eff68c..abd4132 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -505,7 +505,7 @@ M.core_dock.fixTitleOrientation = function(item, title, text) { break; } - if (Y.UA.ie > 7) { + if (Y.UA.ie == 8) { // IE8 can flip the text via CSS but not handle SVG title.setContent(text); title.setAttribute('style', 'writing-mode: tb-rl; filter: flipV flipH;display:inline;'); -- 1.7.9.5 From cd2a0bf71557b4fa525a0644bc2b9f61d22a7c7b Mon Sep 17 00:00:00 2001 From: Davo Smith Date: Wed, 3 Oct 2012 08:46:55 +0100 Subject: [PATCH 781/903] MDL-35288 drag and drop upload - adjust error message text when attempting to upload a folder --- repository/upload/lang/en/repository_upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/upload/lang/en/repository_upload.php b/repository/upload/lang/en/repository_upload.php index 1d5664d..1a0210a 100644 --- a/repository/upload/lang/en/repository_upload.php +++ b/repository/upload/lang/en/repository_upload.php @@ -34,4 +34,4 @@ $string['upload_error_no_file'] = 'No file was uploaded.'; $string['upload_error_no_tmp_dir'] = 'PHP is missing a temporary folder.'; $string['upload_error_cant_write'] = 'Failed to write file to disk.'; $string['upload_error_extension'] = 'A PHP extension stopped the file upload.'; -$string['upload_error_invalid_file'] = 'The file \'{$a}\' has no data in it - did you try to upload a folder?'; \ No newline at end of file +$string['upload_error_invalid_file'] = 'The file \'{$a}\' is either empty or a folder. To upload folders zip them first.'; \ No newline at end of file -- 1.7.9.5 From 2741c017cb193dc2aae94bb7538d5f17175919c7 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 4 Oct 2012 11:57:43 +0800 Subject: [PATCH 782/903] MDL-35661 local plugins do not have general settings URL --- lib/pluginlib.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/pluginlib.php b/lib/pluginlib.php index b224d6d..470fa88 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -2514,12 +2514,4 @@ class plugininfo_local extends plugininfo_base { public function get_uninstall_url() { return new moodle_url('/admin/localplugins.php', array('delete' => $this->name, 'sesskey' => sesskey())); } - - public function get_settings_url() { - if (file_exists($this->full_path('settings.php'))) { - return new moodle_url('/admin/settings.php', array('section' => 'local_' . $this->name)); - } else { - return parent::get_settings_url(); - } - } } -- 1.7.9.5 From 768a2ceafd77094496a3e3c732423e695c7c828c Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Tue, 2 Oct 2012 15:52:00 +0800 Subject: [PATCH 783/903] MDL-34448 - mod/data - Fixing separate groups viewing all entries. --- mod/data/lib.php | 32 +++--- mod/data/tests/fixtures/test_data_records.csv | 132 ++++++++++++------------- mod/data/tests/search_test.php | 28 ++++++ mod/data/view.php | 28 +++++- mod/upgrade.txt | 11 +++ 5 files changed, 149 insertions(+), 82 deletions(-) diff --git a/mod/data/lib.php b/mod/data/lib.php index fc26f78..583ea73 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -3408,21 +3408,28 @@ function data_page_type_list($pagetype, $parentcontext, $currentcontext) { /** * Get all of the record ids from a database activity. * - * @param int $dataid The dataid of the database module. - * @return array $idarray An array of record ids + * @param int $dataid The dataid of the database module. + * @param object $selectdata Contains an additional sql statement for the + * where clause for group and approval fields. + * @param array $params Parameters that coincide with the sql statement. + * @return array $idarray An array of record ids */ -function data_get_all_recordids($dataid) { +function data_get_all_recordids($dataid, $selectdata = '', $params = null) { global $DB; - $initsql = 'SELECT c.recordid - FROM {data_fields} f, - {data_content} c - WHERE f.dataid = :dataid - AND f.id = c.fieldid - GROUP BY c.recordid'; - $initrecord = $DB->get_recordset_sql($initsql, array('dataid' => $dataid)); + $initsql = 'SELECT r.id + FROM {data_records} r + WHERE r.dataid = :dataid'; + if ($selectdata != '') { + $initsql .= $selectdata; + $params = array_merge(array('dataid' => $dataid), $params); + } else { + $params = array('dataid' => $dataid); + } + $initsql .= ' GROUP BY r.id'; + $initrecord = $DB->get_recordset_sql($initsql, $params); $idarray = array(); foreach ($initrecord as $data) { - $idarray[] = $data->recordid; + $idarray[] = $data->id; } // Close the record set and free up resources. $initrecord->close(); @@ -3567,8 +3574,7 @@ function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $so } else { list($insql, $inparam) = $DB->get_in_or_equal(array('-1'), SQL_PARAMS_NAMED); } - $nestfromsql .= ' AND c.recordid ' . $insql . $groupsql; - $nestfromsql = "$nestfromsql $selectdata"; + $nestfromsql .= ' AND c.recordid ' . $insql . $selectdata . $groupsql; $sqlselect['sql'] = "$nestselectsql $nestfromsql $sortorder"; $sqlselect['params'] = $inparam; return $sqlselect; diff --git a/mod/data/tests/fixtures/test_data_records.csv b/mod/data/tests/fixtures/test_data_records.csv index 5ffa5bf..f740429 100644 --- a/mod/data/tests/fixtures/test_data_records.csv +++ b/mod/data/tests/fixtures/test_data_records.csv @@ -1,101 +1,101 @@ id,userid,groupid,dataid,timecreated,timemodified,approved 1,1,0,1,1234567891,1234567892,1 -2,2,0,1,1234567891,1234567892,1 -3,3,0,1,1234567891,1234567892,1 -4,4,0,1,1234567891,1234567892,1 -5,5,0,1,1234567891,1234567892,1 -6,6,0,1,1234567891,1234567892,1 +2,2,1,1,1234567891,1234567892,1 +3,3,2,1,1234567891,1234567892,1 +4,4,1,1,1234567891,1234567892,1 +5,5,1,1,1234567891,1234567892,1 +6,6,2,1,1234567891,1234567892,1 7,7,0,1,1234567891,1234567892,1 -8,8,0,1,1234567891,1234567892,1 -9,9,0,1,1234567891,1234567892,1 -10,10,0,1,1234567891,1234567892,1 -11,11,0,1,1234567891,1234567892,1 -12,12,0,1,1234567891,1234567892,1 -13,13,0,1,1234567891,1234567892,1 +8,8,2,1,1234567891,1234567892,1 +9,9,1,1,1234567891,1234567892,1 +10,10,1,1,1234567891,1234567892,1 +11,11,1,1,1234567891,1234567892,1 +12,12,2,1,1234567891,1234567892,1 +13,13,2,1,1234567891,1234567892,1 14,14,0,1,1234567891,1234567892,1 -15,15,0,1,1234567891,1234567892,1 +15,15,2,1,1234567891,1234567892,1 16,16,0,1,1234567891,1234567892,1 -17,17,0,1,1234567891,1234567892,1 -18,18,0,1,1234567891,1234567892,1 +17,17,1,1,1234567891,1234567892,1 +18,18,2,1,1234567891,1234567892,1 19,19,0,1,1234567891,1234567892,1 -20,20,0,1,1234567891,1234567892,1 +20,20,1,1,1234567891,1234567892,1 21,21,0,1,1234567891,1234567892,1 -22,22,0,1,1234567891,1234567892,1 +22,22,2,1,1234567891,1234567892,1 23,23,0,1,1234567891,1234567892,1 -24,24,0,1,1234567891,1234567892,1 -25,25,0,1,1234567891,1234567892,1 +24,24,2,1,1234567891,1234567892,1 +25,25,2,1,1234567891,1234567892,1 26,26,0,1,1234567891,1234567892,1 -27,27,0,1,1234567891,1234567892,1 -28,28,0,1,1234567891,1234567892,1 +27,27,1,1,1234567891,1234567892,1 +28,28,2,1,1234567891,1234567892,1 29,29,0,1,1234567891,1234567892,1 -30,30,0,1,1234567891,1234567892,1 +30,30,2,1,1234567891,1234567892,1 31,31,0,1,1234567891,1234567892,1 -32,32,0,1,1234567891,1234567892,1 -33,33,0,1,1234567891,1234567892,1 -34,34,0,1,1234567891,1234567892,1 -35,35,0,1,1234567891,1234567892,1 +32,32,1,1,1234567891,1234567892,1 +33,33,1,1,1234567891,1234567892,1 +34,34,2,1,1234567891,1234567892,1 +35,35,1,1,1234567891,1234567892,1 36,36,0,1,1234567891,1234567892,1 37,37,0,1,1234567891,1234567892,1 -38,38,0,1,1234567891,1234567892,1 -39,39,0,1,1234567891,1234567892,1 -40,40,0,1,1234567891,1234567892,1 +38,38,2,1,1234567891,1234567892,1 +39,39,1,1,1234567891,1234567892,1 +40,40,1,1,1234567891,1234567892,1 41,41,0,1,1234567891,1234567892,1 -42,42,0,1,1234567891,1234567892,1 +42,42,1,1,1234567891,1234567892,1 43,43,0,1,1234567891,1234567892,1 -44,44,0,1,1234567891,1234567892,1 +44,44,1,1,1234567891,1234567892,1 45,45,0,1,1234567891,1234567892,1 46,46,0,1,1234567891,1234567892,1 -47,47,0,1,1234567891,1234567892,1 +47,47,1,1,1234567891,1234567892,1 48,48,0,1,1234567891,1234567892,1 49,49,0,1,1234567891,1234567892,1 -50,50,0,1,1234567891,1234567892,1 +50,50,1,1,1234567891,1234567892,1 51,51,0,1,1234567891,1234567892,1 52,52,0,1,1234567891,1234567892,1 -53,53,0,1,1234567891,1234567892,1 -54,54,0,1,1234567891,1234567892,1 +53,53,1,1,1234567891,1234567892,1 +54,54,1,1,1234567891,1234567892,1 55,55,0,1,1234567891,1234567892,1 -56,56,0,1,1234567891,1234567892,1 -57,57,0,1,1234567891,1234567892,1 -58,58,0,1,1234567891,1234567892,1 -59,59,0,1,1234567891,1234567892,1 -60,60,0,1,1234567891,1234567892,1 +56,56,2,1,1234567891,1234567892,1 +57,57,2,1,1234567891,1234567892,1 +58,58,2,1,1234567891,1234567892,1 +59,59,1,1,1234567891,1234567892,1 +60,60,1,1,1234567891,1234567892,1 61,61,0,1,1234567891,1234567892,1 -62,62,0,1,1234567891,1234567892,1 +62,62,2,1,1234567891,1234567892,1 63,63,0,1,1234567891,1234567892,1 64,64,0,1,1234567891,1234567892,1 -65,65,0,1,1234567891,1234567892,1 -66,66,0,1,1234567891,1234567892,1 +65,65,1,1,1234567891,1234567892,1 +66,66,1,1,1234567891,1234567892,1 67,67,0,1,1234567891,1234567892,1 68,68,0,1,1234567891,1234567892,1 -69,69,0,1,1234567891,1234567892,1 -70,70,0,1,1234567891,1234567892,1 +69,69,2,1,1234567891,1234567892,1 +70,70,2,1,1234567891,1234567892,1 71,71,0,1,1234567891,1234567892,1 -72,72,0,1,1234567891,1234567892,1 -73,73,0,1,1234567891,1234567892,1 +72,72,1,1,1234567891,1234567892,1 +73,73,1,1,1234567891,1234567892,1 74,74,0,1,1234567891,1234567892,1 75,75,0,1,1234567891,1234567892,1 -76,76,0,1,1234567891,1234567892,1 -77,77,0,1,1234567891,1234567892,1 +76,76,2,1,1234567891,1234567892,1 +77,77,2,1,1234567891,1234567892,1 78,78,0,1,1234567891,1234567892,1 -79,79,0,1,1234567891,1234567892,1 -80,80,0,1,1234567891,1234567892,1 +79,79,1,1,1234567891,1234567892,1 +80,80,1,1,1234567891,1234567892,1 81,81,0,1,1234567891,1234567892,1 -82,82,0,1,1234567891,1234567892,1 -83,83,0,1,1234567891,1234567892,1 -84,84,0,1,1234567891,1234567892,1 -85,85,0,1,1234567891,1234567892,1 +82,82,1,1,1234567891,1234567892,1 +83,83,1,1,1234567891,1234567892,1 +84,84,1,1,1234567891,1234567892,1 +85,85,1,1,1234567891,1234567892,1 86,86,0,1,1234567891,1234567892,1 87,87,0,1,1234567891,1234567892,1 88,88,0,1,1234567891,1234567892,1 -89,89,0,1,1234567891,1234567892,1 -90,90,0,1,1234567891,1234567892,1 -91,91,0,1,1234567891,1234567892,1 -92,92,0,1,1234567891,1234567892,1 -93,93,0,1,1234567891,1234567892,1 -94,94,0,1,1234567891,1234567892,1 -95,95,0,1,1234567891,1234567892,1 -96,96,0,1,1234567891,1234567892,1 -97,97,0,1,1234567891,1234567892,1 -98,98,0,1,1234567891,1234567892,1 -99,99,0,1,1234567891,1234567892,1 -100,100,0,1,1234567891,1234567892,1 +89,89,1,1,1234567891,1234567892,1 +90,90,1,1,1234567891,1234567892,0 +91,91,2,1,1234567891,1234567892,0 +92,92,0,1,1234567891,1234567892,0 +93,93,2,1,1234567891,1234567892,0 +94,94,1,1,1234567891,1234567892,0 +95,95,1,1,1234567891,1234567892,0 +96,96,1,1,1234567891,1234567892,0 +97,97,0,1,1234567891,1234567892,0 +98,98,1,1,1234567891,1234567892,0 +99,99,2,1,1234567891,1234567892,0 +100,100,0,1,1234567891,1234567892,0 diff --git a/mod/data/tests/search_test.php b/mod/data/tests/search_test.php index 150bc5d..2980643 100644 --- a/mod/data/tests/search_test.php +++ b/mod/data/tests/search_test.php @@ -71,6 +71,11 @@ class data_advanced_search_sql_test extends advanced_testcase { public $datarecordcount = 100; /** + * @var int $groupdatarecordcount The number of records in the database in groups 0 and 1. + */ + public $groupdatarecordcount = 75; + + /** * @var array $datarecordset Expected record IDs. */ public $datarecordset = array('0' => '6'); @@ -81,6 +86,11 @@ class data_advanced_search_sql_test extends advanced_testcase { public $finalrecord = array(); /** + * @var int $approvedatarecordcount The number of approved records in the database. + */ + public $approvedatarecordcount = 89; + + /** * Set up function. In this instance we are setting up database * records to be used in the unit tests. */ @@ -169,6 +179,13 @@ class data_advanced_search_sql_test extends advanced_testcase { * Test 4: data_get_advanced_search_sql provides an array which contains an sql string to be used for displaying records * to the user when they use the advanced search criteria and the parameters that go with the sql statement. This test * takes that information and does a search on the database, returning a record. + * + * Test 5: Returning to data_get_all_recordids(). Here we are ensuring that the total amount of record ids is reduced to + * match the group conditions that are provided. There are 25 entries which relate to group 2. They are removed + * from the total so we should only have 75 records total. + * + * Test 6: data_get_all_recordids() again. This time we are testing approved database records. We only want to + * display the records that have been approved. In this record set we have 89 approved records. */ function test_advanced_search_sql_section() { global $DB; @@ -193,5 +210,16 @@ class data_advanced_search_sql_test extends advanced_testcase { $allparams = array_merge($html['params'], array('dataid' => $this->recorddata->id)); $records = $DB->get_records_sql($html['sql'], $allparams); $this->assertEquals($records, $this->finalrecord); + + // Test 5 + $groupsql = " AND (r.groupid = :currentgroup OR r.groupid = 0)"; + $params = array('currentgroup' => 1); + $recordids = data_get_all_recordids($this->recorddata->id, $groupsql, $params); + $this->assertEquals($this->groupdatarecordcount, count($recordids)); + + // Test 6 + $approvesql = ' AND r.approved=1 '; + $recordids = data_get_all_recordids($this->recorddata->id, $approvesql, $params); + $this->assertEquals($this->approvedatarecordcount, count($recordids)); } } diff --git a/mod/data/view.php b/mod/data/view.php index 3e9146e..1b2d85b 100644 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -321,6 +321,13 @@ groups_print_activity_menu($cm, $returnurl); $currentgroup = groups_get_activity_group($cm); $groupmode = groups_get_activity_groupmode($cm); + // If a student is not part of a group and seperate groups is enabled, we don't + // want them seeing all records. + if ($currentgroup == 0 && $groupmode == 1 && !has_capability('mod/data:manageentries', $context)) { + $canviewallrecords = false; + } else { + $canviewallrecords = true; + } // detect entries not approved yet and show hint instead of not found error if ($record and $data->approval and !$record->approved and $record->userid != $USER->id and !has_capability('mod/data:manageentries', $context)) { @@ -465,7 +472,13 @@ if ($showactivity) { $groupselect = " AND (r.groupid = :currentgroup OR r.groupid = 0)"; $params['currentgroup'] = $currentgroup; } else { - $groupselect = ' '; + if ($canviewallrecords) { + $groupselect = ' '; + } else { + // If separate groups are enabled and the user isn't in a group or + // a teacher, manager, admin etc, then just show them entries for 'All participants'. + $groupselect = " AND r.groupid = 0"; + } } // Init some variables to be used by advanced search @@ -590,10 +603,19 @@ if ($showactivity) { $sqlmax = "SELECT $count FROM $tables $where $groupselect $approveselect"; // number of all recoirds user may see $allparams = array_merge($params, $advparams); - $recordids = data_get_all_recordids($data->id); + // Provide initial sql statements and parameters to reduce the number of total records. + $selectdata = $groupselect . $approveselect; + $initialparams = array(); + if ($currentgroup) { + $initialparams['currentgroup'] = $params['currentgroup']; + } + if (!$approvecap && $data->approval && isloggedin()) { + $initialparams['myid1'] = $params['myid1']; + } + + $recordids = data_get_all_recordids($data->id, $selectdata, $initialparams); $newrecordids = data_get_advance_search_ids($recordids, $search_array, $data->id); $totalcount = count($newrecordids); - $selectdata = $groupselect . $approveselect; if (!empty($advanced)) { $advancedsearchsql = data_get_advanced_search_sql($sort, $data, $newrecordids, $selectdata, $sortorder); diff --git a/mod/upgrade.txt b/mod/upgrade.txt index 72411c8..6eac247 100644 --- a/mod/upgrade.txt +++ b/mod/upgrade.txt @@ -21,6 +21,9 @@ optional - no changes needed: xxx_dndupload_register() and xxx_dndupload_handle($uploadinfo) see: http://docs.moodle.org/dev/Implementing_Course_drag_and_drop_upload_support_in_a_module +* mod/data/lib.php data_get_all_recordids() now has two new optional variables: $selectdata and $params. + + === 2.2 === required changes in code: @@ -29,12 +32,20 @@ required changes in code: * textlib->asort() replaced by specialized collatorlib::asort() * use new make_temp_directory() and make_cache_directory() +optional - no changes needed: + +* mod/data/lib.php data_get_all_recordids() now has two new optional variables: $selectdata and $params. + === 2.1 === required changes in code: * add new support for basic restore from 1.9 +optional - no changes needed: + +* mod/data/lib.php data_get_all_recordids() now has two new optional variables: $selectdata and $params. + === 2.0 === -- 1.7.9.5 From 92bff8685cc2f827aed0375a4781ef0c12e77e40 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Mon, 1 Oct 2012 23:03:51 +0200 Subject: [PATCH 784/903] MDL-35724 - Right align "Question Type" label in Quiz Editing page, when in RTL mode --- mod/quiz/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 3ab0f5a..8fe5b30 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -251,6 +251,7 @@ table#categoryquestions {width: 100%;overflow: hidden;table-layout: fixed;} #page-mod-quiz-edit div.question div.content .singlequestion .questiontext{display:inline-block;} #page-mod-quiz-edit div.question div.content .singlequestion .questionpreview{background-color:#eee;} #page-mod-quiz-edit div.question div.content .questiontype{display:block;clear:left;float:left;} +#page-mod-quiz-edit.dir-rtl div.question div.content .questiontype {clear: right;float: right;} #page-mod-quiz-edit div.question div.content .questionpreview {display:block;float:left;margin-left:0.3em;padding-left:0.2em;padding-right:0.2em;} #page-mod-quiz-edit div.question div.content .questionpreview a{background-color:#eee;} #page-mod-quiz-edit div.question div.content div.quiz_randomquestion .questionpreview{display:inline;float:none;} -- 1.7.9.5 From aae3d3445eeecdb181fec66ba9fec21d8782702b Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Mon, 1 Oct 2012 23:13:21 +0200 Subject: [PATCH 785/903] MDL-35724 - Move Question Marks block to the left (Question Bank page),in RTL mode --- mod/quiz/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 8fe5b30..60fe3ec 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -400,7 +400,7 @@ bank window's title is prominent enough*/ #page-mod-quiz-edit.dir-rtl div.question {clear: right;} #page-mod-quiz-edit.dir-rtl div.question div.qnum {float: right;} #page-mod-quiz-edit.dir-rtl div.editq div.question div.content {float: right;height: 40px;} -#page-mod-quiz-edit.dir-rtl div.question div.content div.points {left: 50px;right:auto;} +#page-mod-quiz-edit.dir-rtl div.question div.content div.points {left: 5px;right:auto;} #page-mod-quiz-edit.dir-rtl div.question div.content div.questioncontrols {float: left;left: 0.3em; right:auto;} #page-mod-quiz-edit.dir-rtl .editq div.question div.content .singlequestion .questioneditbutton .questionname, #page-mod-quiz-edit.dir-rtl .editq div.question div.content .singlequestion .questioneditbutton .questiontext {float: right; padding-right: 0.3em;} -- 1.7.9.5 From 2ed34366f6dc63eb5aa100feae1537b022846aaf Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 8 Oct 2012 22:54:33 +0200 Subject: [PATCH 786/903] Revert "MDL-34894 course ws unit tests: fix windows problem." This reverts commit 40d651bbbb20b4373b6b56e4e09c90b30ff86484. With MDL-35714, each test gets gc_collect_cycles() called, so no need to call it "manually". --- course/tests/externallib_test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php index 605c5d8..984b9ed 100644 --- a/course/tests/externallib_test.php +++ b/course/tests/externallib_test.php @@ -580,6 +580,5 @@ class core_course_external_testcase extends externallib_advanced_testcase { // Check that the course has been duplicated. $this->assertEquals($newcourse['shortname'], $duplicate['shortname']); - gc_collect_cycles(); } } -- 1.7.9.5 From af861e14dc5c83a5f4d142a0d13de1eb7467349b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Arenaza?= Date: Fri, 27 Apr 2012 00:23:42 +0200 Subject: [PATCH 787/903] MDL-31968 Make NTLM REMOTE_USER format configurable by the admin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Iñaki Arenaza --- auth/ldap/auth.php | 79 ++++++++++++++++++++++++++++++++++++++- auth/ldap/config.html | 15 ++++++++ auth/ldap/lang/en/auth_ldap.php | 4 ++ 3 files changed, 96 insertions(+), 2 deletions(-) diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php index 88bb10d..c206452 100644 --- a/auth/ldap/auth.php +++ b/auth/ldap/auth.php @@ -41,6 +41,18 @@ if (!defined('AUTH_GID_NOGROUP')) { define('AUTH_GID_NOGROUP', -2); } +// Regular expressions for a valid NTLM username and domain name. +if (!defined('AUTH_NTLM_VALID_USERNAME')) { + define('AUTH_NTLM_VALID_USERNAME', '[^/\\\\\\\\\[\]:;|=,+*?<>@"]+'); +} +if (!defined('AUTH_NTLM_VALID_DOMAINNAME')) { + define('AUTH_NTLM_VALID_DOMAINNAME', '[^\\\\\\\\\/:*?"<>|]+'); +} +// Default format for remote users if using NTLM SSO +if (!defined('AUTH_NTLM_DEFAULT_FORMAT')) { + define('AUTH_NTLM_DEFAULT_FORMAT', '%domain%\\%username%'); +} + require_once($CFG->libdir.'/authlib.php'); require_once($CFG->libdir.'/ldaplib.php'); @@ -1570,8 +1582,11 @@ class auth_plugin_ldap extends auth_plugin_base { switch ($this->config->ntlmsso_type) { case 'ntlm': - // Format is DOMAIN\username - $username = substr(strrchr($username, '\\'), 1); + // The format is now configurable, so try to extract the username + $username = $this->get_ntlm_remote_user($username); + if (empty($username)) { + return false; + } break; case 'kerberos': // Format is username@DOMAIN @@ -1779,6 +1794,9 @@ class auth_plugin_ldap extends auth_plugin_base { if (!isset($config->ntlmsso_type)) { $config->ntlmsso_type = 'ntlm'; } + if (!isset($config->ntlmsso_remoteuserformat)) { + $config->ntlmsso_remoteuserformat = ''; + } // Try to remove duplicates before storing the contexts (to avoid problems in sync_users()). $config->contexts = explode(';', $config->contexts); @@ -1818,6 +1836,7 @@ class auth_plugin_ldap extends auth_plugin_base { set_config('ntlmsso_subnet', trim($config->ntlmsso_subnet), $this->pluginconfig); set_config('ntlmsso_ie_fastpath', (int)$config->ntlmsso_ie_fastpath, $this->pluginconfig); set_config('ntlmsso_type', $config->ntlmsso_type, 'auth/ldap'); + set_config('ntlmsso_remoteuserformat', trim($config->ntlmsso_remoteuserformat), 'auth/ldap'); return true; } @@ -2018,4 +2037,60 @@ class auth_plugin_ldap extends auth_plugin_base { $this->config->user_attribute, $this->config->search_sub); } + + /** + * A chance to validate form data, and last chance to do stuff + * before it is inserted in config_plugin + * + * @param object object with submitted configuration settings (without system magic quotes) + * @param array $err array of error messages (passed by reference) + */ + function validate_form($form, &$err) { + if ($form->ntlmsso_type == 'ntlm') { + $format = trim($form->ntlmsso_remoteuserformat); + if (!empty($format) && !preg_match('/%username%/i', $format)) { + $err['ntlmsso_remoteuserformat'] = get_string('auth_ntlmsso_missing_username', 'auth_ldap'); + } + } + } + + + /** + * When using NTLM SSO, the format of the remote username we get in + * $_SERVER['REMOTE_USER'] may vary, depending on where from and how the web + * server gets the data. So we let the admin configure the format using two + * place holders (%domain% and %username%). This function tries to extract + * the username (stripping the domain part and any separators if they are + * present) from the value present in $_SERVER['REMOTE_USER'], using the + * configured format. + * + * @param string $remoteuser The value from $_SERVER['REMOTE_USER'] (converted to UTF-8) + * + * @return string The remote username (without domain part or + * separators). Empty string if we can't extract the username. + */ + protected function get_ntlm_remote_user($remoteuser) { + if (empty($this->config->ntlmsso_remoteuserformat)) { + $format = AUTH_NTLM_DEFAULT_FORMAT; + } else { + $format = $this->config->ntlmsso_remoteuserformat; + } + + $format = preg_quote($format); + $formatregex = preg_replace(array('#%domain%#', '#%username%#'), + array('('.AUTH_NTLM_VALID_DOMAINNAME.')', '('.AUTH_NTLM_VALID_USERNAME.')'), + $format); + if (preg_match('#^'.$formatregex.'$#', $remoteuser, $matches)) { + $user = end($matches); + return $user; + } + + /* We are unable to extract the username with the configured format. Probably + * the format specified is wrong, so log a warning for the admin and return + * an empty username. + */ + error_log($this->errorlogtag.get_string ('auth_ntlmsso_maybeinvalidformat', 'auth_ldap')); + return ''; + } + } // End of the class diff --git a/auth/ldap/config.html b/auth/ldap/config.html index 8ad27ef..3efe253 100644 --- a/auth/ldap/config.html +++ b/auth/ldap/config.html @@ -94,6 +94,9 @@ if (!isset($config->ntlmsso_ie_fastpath)) { if (!isset($config->ntlmsso_type)) { $config->ntlmsso_type = 'ntlm'; } +if (!isset($config->ntlmsso_remoteuserformat)) { + $config->ntlmsso_remoteuserformat = ''; +} $yesno = array(get_string('no'), get_string('yes')); @@ -539,6 +542,18 @@ $yesno = array(get_string('no'), get_string('yes')); + + + + + + + error_text($err['ntlmsso_remoteuserformat']); } ?> + + + + + %domain% placeholder to specify where the domain name appears, and the mandatory %username% placeholder to specify where the username appears.

      Some widely used formats are %domain%\\%username% (MS Windows default), %domain%/%username%, %domain%+%username% and just %username% (if there is no domain part).'; $string['auth_ntlmsso_subnet'] = 'If set, it will only attempt SSO with clients in this subnet. Format: xxx.xxx.xxx.xxx/bitmask. Separate multiple subnets with \',\' (comma).'; $string['auth_ntlmsso_subnet_key'] = 'Subnet'; $string['auth_ntlmsso_type_key'] = 'Authentication type'; -- 1.7.9.5 From 5364f9c7cdd73b86edf11f318ed4de4beb1d266f Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Tue, 9 Oct 2012 00:34:42 +0000 Subject: [PATCH 788/903] Automatically generated installer lang files --- install/lang/sr_cr/install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lang/sr_cr/install.php b/install/lang/sr_cr/install.php index 1dc0ec5..6a243d6 100644 --- a/install/lang/sr_cr/install.php +++ b/install/lang/sr_cr/install.php @@ -45,7 +45,7 @@ $string['datarootpermission'] = 'Овлашћења над директориј $string['dbprefix'] = 'Префикс табеле'; $string['dirroot'] = 'Moodle директоријум'; $string['environmenthead'] = 'Проверавање Вашег окружења...'; -$string['environmentsub2'] = 'Свака верзија Moodlea има минимум захтева по питању одговарајуће PHP верѕије и неколико обавезних PHP екстензија. +$string['environmentsub2'] = 'Свака верзија Moodlea има минимум захтева по питању одговарајуће PHP верзије и неколико обавезних PHP екстензија. Пуна провера окружења се врши пре сваке инсталације или ажурирања постојеће верзије. Уколико не знате како да инсталирате нову верзију или омогућите PHP ектензије контактирајте Вашег сервер администратора.'; $string['errorsinenvironment'] = 'Провера окружења није прошла!'; $string['installation'] = 'Инсталација'; @@ -75,7 +75,7 @@ $string['pathssubwwwroot'] = 'Пуна веб адреса путем које Ако је адреса нетачна промените URL у свом веб читачу да бисте поново покренули инсталацију са другачијом вредношћу.'; $string['pathsunsecuredataroot'] = 'Dataroot локација није безбедна'; $string['pathswrongadmindir'] = 'Админ директоријум не постоји'; -$string['phpextension'] = '{$a} PHP екстенѕија'; +$string['phpextension'] = '{$a} PHP екстензија'; $string['phpversion'] = 'PHP верзија'; $string['phpversionhelp'] = '

      Moodle захтева најмање PHP верзију 4.3.0 или 5.1.0 (5.0.x има бројне уочене проблеме).

      Тренутно користите верзију {$a}

      -- 1.7.9.5 From 8715a53d90da81beff3c90561ee1274e7359be17 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 5 Oct 2012 11:47:14 +0800 Subject: [PATCH 789/903] MDL-30691 Adminstration: Added css to break long word in filter table --- admin/tool/customlang/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/tool/customlang/styles.css b/admin/tool/customlang/styles.css index c743bcf..963b289 100644 --- a/admin/tool/customlang/styles.css +++ b/admin/tool/customlang/styles.css @@ -67,3 +67,7 @@ #page-admin-tool-customlang-index .continuebutton { margin-top: 1em; } + +.path-admin-tool-customlang #translator .standard.master.cell.c2 { + word-break: break-all; +} -- 1.7.9.5 From add569ebe0ef324599c5435cc50530db4d99f55e Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Thu, 4 Oct 2012 16:11:09 +0800 Subject: [PATCH 790/903] MDL-35787 Mnet: fixed php strict standards warnings --- auth/mnet/auth.php | 3 ++- mnet/service/enrol/course.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 0a136e8..2e21aaa 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -378,7 +378,8 @@ class auth_plugin_mnet extends auth_plugin_base { $extra = $DB->get_records_sql($sql); $keys = array_keys($courses); - $defaultrole = reset(get_archetype_roles('student')); + $studentroles = get_archetype_roles('student'); + $defaultrole = reset($studentroles); //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!! foreach ($keys AS $id) { if ($courses[$id]->visible == 0) { diff --git a/mnet/service/enrol/course.php b/mnet/service/enrol/course.php index d67eaf6..632e4d3 100644 --- a/mnet/service/enrol/course.php +++ b/mnet/service/enrol/course.php @@ -62,7 +62,7 @@ echo $OUTPUT->heading($icon . s($course->fullname)); // collapsible course summary if (!empty($course->summary)) { - unset($options); + $options = new stdClass(); $options->trusted = false; $options->para = false; $options->filter = false; -- 1.7.9.5 From 18f9ad377fc6ac4cc51480bf07be7dc152d056b2 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 9 Oct 2012 15:22:03 +0800 Subject: [PATCH 791/903] MDL-35787 Mnet: If student role is not defined then throw error --- auth/mnet/auth.php | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 2e21aaa..14a42ac 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -379,23 +379,27 @@ class auth_plugin_mnet extends auth_plugin_base { $keys = array_keys($courses); $studentroles = get_archetype_roles('student'); - $defaultrole = reset($studentroles); - //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!! - foreach ($keys AS $id) { - if ($courses[$id]->visible == 0) { - unset($courses[$id]); - continue; + if (!empty($studentroles)) { + $defaultrole = reset($studentroles); + //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!! + foreach ($keys AS $id) { + if ($courses[$id]->visible == 0) { + unset($courses[$id]); + continue; + } + $courses[$id]->cat_id = $courses[$id]->category; + $courses[$id]->defaultroleid = $defaultrole->id; + unset($courses[$id]->category); + unset($courses[$id]->visible); + + $courses[$id]->cat_name = $extra[$id]->cat_name; + $courses[$id]->cat_description = $extra[$id]->cat_description; + $courses[$id]->defaultrolename = $defaultrole->name; + // coerce to array + $courses[$id] = (array)$courses[$id]; } - $courses[$id]->cat_id = $courses[$id]->category; - $courses[$id]->defaultroleid = $defaultrole->id; - unset($courses[$id]->category); - unset($courses[$id]->visible); - - $courses[$id]->cat_name = $extra[$id]->cat_name; - $courses[$id]->cat_description = $extra[$id]->cat_description; - $courses[$id]->defaultrolename = $defaultrole->name; - // coerce to array - $courses[$id] = (array)$courses[$id]; + } else { + throw new moodle_exception('unknownrole', 'error', '', 'student'); } } else { // if the array is empty, send it anyway -- 1.7.9.5 From e22cff45ab2abedb449c2e8ed54b0fd7b58ee647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 9 Oct 2012 09:43:08 +0200 Subject: [PATCH 792/903] MDL-35898 include static course caches in test resets --- lib/phpunit/classes/util.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index b580259..6376e14 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -618,6 +618,10 @@ class phpunit_util { $GROUPLIB_CACHE = null; //TODO MDL-25290: add more resets here and probably refactor them to new core function + // Rest course and module caches. + $reset = 'reset'; + get_fast_modinfo($reset); + // purge dataroot directory self::reset_dataroot(); -- 1.7.9.5 From ad87b3a2cc951ea6908a00eb266c667366edf236 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 9 Oct 2012 10:28:21 +0800 Subject: [PATCH 793/903] MDL-35858 question: Fixed display of feedback in cloze questions --- question/type/multianswer/module.js | 2 +- question/type/multianswer/renderer.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/question/type/multianswer/module.js b/question/type/multianswer/module.js index beb3788..2fbe4e0 100644 --- a/question/type/multianswer/module.js +++ b/question/type/multianswer/module.js @@ -27,7 +27,7 @@ M.qtype_multianswer = M.qtype_multianswer || {}; M.qtype_multianswer.init = function (Y, questiondiv) { - Y.one(questiondiv).all('label.subq').each(function(subqspan, i) { + Y.one(questiondiv).all('span.subquestion').each(function(subqspan, i) { var feedbackspan = subqspan.one('.feedbackspan'); if (!feedbackspan) { return; diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php index 0134eb4..5afe4ff 100644 --- a/question/type/multianswer/renderer.php +++ b/question/type/multianswer/renderer.php @@ -227,12 +227,13 @@ class qtype_multianswer_textfield_renderer extends qtype_multianswer_subq_render $qa, 'question', 'answerfeedback', $matchinganswer->id), s($correctanswer->answer), $options); - $output = ''; + $output = html_writer::start_tag('span', array('class' => 'subquestion')); $output .= html_writer::tag('label', get_string('answer'), array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); $output .= html_writer::empty_tag('input', $inputattributes); $output .= $feedbackimg; $output .= $feedbackpopup; + $output .= html_writer::end_tag('span'); return $output; } @@ -294,12 +295,13 @@ class qtype_multianswer_multichoice_inline_renderer $subq->format_text($rightanswer->answer, $rightanswer->answerformat, $qa, 'question', 'answer', $rightanswer->id), $options); - $output = ''; + $output = html_writer::start_tag('span', array('class' => 'subquestion')); $output .= html_writer::tag('label', get_string('answer'), array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); $output .= $select; $output .= $feedbackimg; $output .= $feedbackpopup; + $output .= html_writer::end_tag('span'); return $output; } -- 1.7.9.5 From aedc642091430d8b6cf1f780507d9291d2b45257 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Tue, 9 Oct 2012 16:35:32 +0800 Subject: [PATCH 794/903] MDL-35587 fixed up whitespaces --- course/dndupload.js | 10 +++++----- course/dnduploadlib.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/course/dndupload.js b/course/dndupload.js index e410d40..2dcaa13 100644 --- a/course/dndupload.js +++ b/course/dndupload.js @@ -728,13 +728,13 @@ M.course_dndupload = { resel.icon.src = result.icon; resel.a.href = result.link; resel.namespan.innerHTML = result.name; - + if (result.groupingname) { resel.groupingspan.innerHTML = '(' + result.groupingname + ')'; } else { resel.div.removeChild(resel.groupingspan); } - + resel.div.removeChild(resel.progressouter); resel.li.id = result.elementid; resel.div.innerHTML += result.commands; @@ -915,13 +915,13 @@ M.course_dndupload = { resel.icon.src = result.icon; resel.a.href = result.link; resel.namespan.innerHTML = result.name; - + if (result.groupingname) { resel.groupingspan.innerHTML = '(' + result.groupingname + ')'; } else { resel.div.removeChild(resel.groupingspan); - } - + } + resel.div.removeChild(resel.progressouter); resel.li.id = result.elementid; resel.div.innerHTML += result.commands; diff --git a/course/dnduploadlib.php b/course/dnduploadlib.php index 043b6c7..038c09b 100644 --- a/course/dnduploadlib.php +++ b/course/dnduploadlib.php @@ -670,9 +670,9 @@ class dndupload_ajax_processor { // 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->groupingname = format_string($groupings[$mod->groupingid]->name); } - + echo $OUTPUT->header(); echo json_encode($resp); die(); -- 1.7.9.5 From 86b1d0eb5facdb1b881cdd30d028786127e8821b Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 9 Oct 2012 11:59:46 +0200 Subject: [PATCH 795/903] MDL-35898 test reset: Tidyup comment --- lib/phpunit/classes/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index 7096b8d..f9dc68d 100644 --- a/lib/phpunit/classes/util.php +++ b/lib/phpunit/classes/util.php @@ -621,7 +621,7 @@ class phpunit_util { $GROUPLIB_CACHE = null; //TODO MDL-25290: add more resets here and probably refactor them to new core function - // Rest course and module caches. + // Reset course and module caches. $reset = 'reset'; get_fast_modinfo($reset); -- 1.7.9.5 From d01c6b269b254b722b0a292105e404d38dfbc0e1 Mon Sep 17 00:00:00 2001 From: Simon Coggins Date: Wed, 10 Oct 2012 08:52:58 +1300 Subject: [PATCH 796/903] MDL-35581 lib: Help popups misaligned for right-to-left languages --- lib/javascript-static.js | 9 ++++++++- theme/base/style/core.css | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 4189c37..471f3d8 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1434,9 +1434,16 @@ M.util.help_icon = { }, display : function(event, args) { + if (Y.one('html').get('dir') == 'rtl') { + var overlayPosition = [Y.WidgetPositionAlign.TR, Y.WidgetPositionAlign.LC]; + } else { + var overlayPosition = [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.RC]; + } + this.helplink = args.node; + this.overlay.set('bodyContent', Y.Node.create('')); - this.overlay.set("align", {node:args.node, points:[Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.RC]}); + this.overlay.set("align", {node:args.node, points: overlayPosition}); var fullurl = args.url; if (!args.url.match(/https?:\/\//)) { diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 3aec3d8..8590e1d 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -479,6 +479,7 @@ body.tag .managelink {padding: 5px;} #helppopupbox .yui3-widget-bd {margin:0 1em 1em 1em;border-top:1px solid #eee;} #helppopupbox .helpheading {font-size: 1em;} #helppopupbox .spinner {margin:1em;} +.dir-rtl #helppopupbox .yui3-widget-hd {float:left;margin:3px 0 0 3px;} /** * Custom menu -- 1.7.9.5 From c5c735f00ea9d9501fc1f27ff7d4ebdb9f709f31 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 10 Oct 2012 00:34:20 +0000 Subject: [PATCH 797/903] Automatically generated installer lang files --- install/lang/ro/install.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/install/lang/ro/install.php b/install/lang/ro/install.php index 1971fb3..ec01ae5 100644 --- a/install/lang/ro/install.php +++ b/install/lang/ro/install.php @@ -30,15 +30,22 @@ defined('MOODLE_INTERNAL') || die(); -$string['admindirname'] = 'Admin Directory'; +$string['admindirname'] = 'Director Admin'; $string['availablelangs'] = 'Pachete de limbă disponibile'; $string['chooselanguagehead'] = 'Selectare limbă'; $string['chooselanguagesub'] = 'Vă rugăm selectaţi limba pentru interfaţa de instalare, limba selectată va fi folosită EXCLUSIV în cadrul procedurii de instalare. Ulterior veţi putea selecta limba în care doriţi să fie afişată interfaţa.'; -$string['dataroot'] = 'Data Directory'; +$string['databasehost'] = 'Gazdă baza de date'; +$string['databasename'] = 'Nume baza de date'; +$string['databasetypehead'] = 'Alegere driver baza de date'; +$string['dataroot'] = 'Director date'; +$string['datarootpermission'] = 'Permisiuni directoare date'; $string['dbprefix'] = 'Prefix tabele'; $string['dirroot'] = 'Director Moodle'; $string['environmenthead'] = 'Se verifică mediul...'; $string['installation'] = 'Instalare'; +$string['paths'] = 'Căi'; +$string['pathshead'] = 'Confirmare căi'; +$string['phpextension'] = 'extensie PHP {$a}'; $string['phpversion'] = 'Versiune PHP'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['wwwroot'] = 'Adresă Web'; -- 1.7.9.5 From 437637a11d046438e184cda92c3a88c60eb40a45 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Thu, 11 Oct 2012 10:55:37 +0800 Subject: [PATCH 798/903] MDL-31010 comments: setup_course should update if passed courseid is different from the cached one --- comment/locallib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comment/locallib.php b/comment/locallib.php index 5a8b0d7..31b2799 100644 --- a/comment/locallib.php +++ b/comment/locallib.php @@ -94,7 +94,7 @@ class comment_manager { */ private function setup_course($courseid) { global $PAGE, $DB; - if (!empty($this->course)) { + if (!empty($this->course) && $this->course->id == $courseid) { // already set, stop return; } -- 1.7.9.5 From 0cb1a22cba30d68734887f787479767cf21f07c8 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Thu, 11 Oct 2012 14:22:34 +0800 Subject: [PATCH 799/903] MDL-28965 administration: Updating description string for the setting navshowallcourses --- lang/en/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/en/admin.php b/lang/en/admin.php index 8a6a935..919a7a9 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -258,7 +258,7 @@ $string['configmycoursesperpage'] = 'Maximum number of courses to display in any $string['configmymoodleredirect'] = 'This setting forces redirects to /my on login for non-admins and replaces the top level site navigation with /my'; $string['configmypagelocked'] = 'This setting prevents the default page from being edited by any non-admins'; $string['confignavcourselimit'] = 'Limits the number of courses shown to the user when they are either not logged in or are not enrolled in any courses.'; -$string['confignavshowallcourses'] = 'If enabled users will see courses they are enrolled in both within the My Courses branch and the course structure. When disabled users with enrolments will only see the My Courses branch of the navigaiton.'; +$string['confignavshowallcourses'] = 'If enabled users will see courses they are enrolled in both within the My Courses branch and the course structure. When disabled users with enrolments will only see the My Courses branch of the navigaiton. The number of course shown would still be limited by "Course limit(navcourselimit)" setting when user is either not logged in or not enrolled in any course.'; $string['confignavshowcategories'] = 'Show course categories in the navigation bar and navigation blocks. This does not occur with courses the user is currently enrolled in, they will still be listed under mycourses without categories.'; $string['confignotifyloginfailures'] = 'If login failures have been recorded, email notifications can be sent out. Who should see these notifications?'; $string['confignotifyloginthreshold'] = 'If notifications about failed logins are active, how many failed login attempts by one user or one IP address is it worth notifying about?'; -- 1.7.9.5 From 2c484717e1a191d0ce2f7ac0436ac75f30cfa0fb Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 11 Oct 2012 16:02:16 +0800 Subject: [PATCH 800/903] MDL-33815 Online Users block: Add query condition to filter out deleted users and lastaccess date greater than now --- blocks/online_users/block_online_users.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php index cbf1dac..2efe9a2 100644 --- a/blocks/online_users/block_online_users.php +++ b/blocks/online_users/block_online_users.php @@ -31,7 +31,8 @@ class block_online_users extends block_base { if (isset($CFG->block_online_users_timetosee)) { $timetoshowusers = $CFG->block_online_users_timetosee * 60; } - $timefrom = 100 * floor((time()-$timetoshowusers) / 100); // Round to nearest 100 seconds for better query cache + $now = time(); + $timefrom = 100 * floor(($now - $timetoshowusers) / 100); // Round to nearest 100 seconds for better query cache //Calculate if we are in separate groups $isseparategroups = ($this->page->course->groupmode == SEPARATEGROUPS @@ -53,18 +54,23 @@ class block_online_users extends block_base { } $userfields = user_picture::fields('u', array('username')); - + $params['now'] = $now; + $params['timefrom'] = $timefrom; if ($this->page->course->id == SITEID or $this->page->context->contextlevel < CONTEXT_COURSE) { // Site-level $sql = "SELECT $userfields, MAX(u.lastaccess) AS lastaccess FROM {user} u $groupmembers - WHERE u.lastaccess > $timefrom + WHERE u.lastaccess > :timefrom + AND u.lastaccess <= :now + AND u.deleted = 0 $groupselect GROUP BY $userfields ORDER BY lastaccess DESC "; $csql = "SELECT COUNT(u.id) FROM {user} u $groupmembers - WHERE u.lastaccess > $timefrom + WHERE u.lastaccess > :timefrom + AND u.lastaccess <= :now + AND u.deleted = 0 $groupselect"; } else { @@ -77,9 +83,11 @@ class block_online_users extends block_base { $sql = "SELECT $userfields, MAX(ul.timeaccess) AS lastaccess FROM {user_lastaccess} ul $groupmembers, {user} u JOIN ($esqljoin) euj ON euj.id = u.id - WHERE ul.timeaccess > $timefrom + WHERE ul.timeaccess > :timefrom AND u.id = ul.userid AND ul.courseid = :courseid + AND ul.timeaccess <= :now + AND u.deleted = 0 $groupselect GROUP BY $userfields ORDER BY lastaccess DESC"; @@ -87,9 +95,11 @@ class block_online_users extends block_base { $csql = "SELECT COUNT(u.id) FROM {user_lastaccess} ul $groupmembers, {user} u JOIN ($esqljoin) euj ON euj.id = u.id - WHERE ul.timeaccess > $timefrom + WHERE ul.timeaccess > :timefrom AND u.id = ul.userid AND ul.courseid = :courseid + AND ul.timeaccess <= :now + AND u.deleted = 0 $groupselect"; $params['courseid'] = $this->page->course->id; @@ -138,7 +148,7 @@ class block_online_users extends block_base { } foreach ($users as $user) { $this->content->text .= '
    • '; - $timeago = format_time(time() - $user->lastaccess); //bruno to calculate correctly on frontpage + $timeago = format_time($now - $user->lastaccess); //bruno to calculate correctly on frontpage if (isguestuser($user)) { $this->content->text .= '
      '.$OUTPUT->user_picture($user, array('size'=>16)); -- 1.7.9.5 From 696527c0fe2cb94d516073d79d337afd51508dd3 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 11 Oct 2012 16:11:58 +0800 Subject: [PATCH 801/903] MDL-21801 Lesson Module: Removing import power point functionality --- mod/lesson/importppt.php | 211 -------------------------------------- mod/lesson/importpptlib.php | 236 ------------------------------------------- mod/lesson/renderer.php | 3 - 3 files changed, 450 deletions(-) delete mode 100644 mod/lesson/importppt.php delete mode 100644 mod/lesson/importpptlib.php diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php deleted file mode 100644 index 84bd61b..0000000 --- a/mod/lesson/importppt.php +++ /dev/null @@ -1,211 +0,0 @@ -. - -/** - * This is a very rough importer for powerpoint slides - * Export a powerpoint presentation with powerpoint as html pages - * Do it with office 2002 (I think?) and no special settings - * Then zip the directory with all of the html pages - * and the zip file is what you want to upload - * - * The script supports book and lesson. - * - * @package mod - * @subpackage lesson - * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - **/ - -/** include required files */ -require_once("../../config.php"); -require_once($CFG->dirroot.'/mod/lesson/locallib.php'); -require_once($CFG->dirroot.'/mod/lesson/importpptlib.php'); - -$id = required_param('id', PARAM_INT); // Course Module ID -$pageid = optional_param('pageid', '', PARAM_INT); // Page ID - -$url = new moodle_url('/mod/lesson/importppt.php', array('id'=>$id)); -if ($pageid !== '') { - $url->param('pageid', $pageid); -} -$PAGE->set_url($url); - -$cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);; -$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -$lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST)); - -$modname = 'lesson'; -$mod = $cm; -require_login($course, false, $cm); - -require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); -require_capability('mod/lesson:edit', $context); - -$strimportppt = get_string("importppt", "lesson"); -$strlessons = get_string("modulenameplural", "lesson"); - -$data = new stdClass; -$data->id = $cm->id; -$data->pageid = $pageid; -$mform = new lesson_importppt_form(); -$mform->set_data($data); - -if ($data = $mform->get_data()) { - $manager = lesson_page_type_manager::get($lesson); - if (!$filename = $mform->get_new_filename('pptzip')) { - print_error('invalidfile', 'lesson'); - } - if (!$package = $mform->save_stored_file('pptzip', $context->id, 'mod_lesson', 'ppt_imports', $lesson->id, '/', $filename, true)) { - print_error('unabletosavefile', 'lesson'); - } - // extract package content - $packer = get_file_packer('application/zip'); - $package->extract_to_storage($packer, $context->id, 'mod_lesson', 'imported_files', $lesson->id, '/'); - - $fs = get_file_storage(); - if ($files = $fs->get_area_files($context->id, 'mod_lesson', 'imported_files', $lesson->id)) { - - $pages = array(); - foreach ($files as $key=>$file) { - if ($file->get_mimetype() != 'text/html') { - continue; - } - $filenameinfo = pathinfo($file->get_filepath().$file->get_filename()); - - $page = new stdClass; - $page->title = ''; - $page->contents = array(); - $page->images = array(); - $page->source = $filenameinfo['basename']; - - $string = strip_tags($file->get_content(),'
      '); - $imgs = array(); - preg_match_all("/]*(src\=\"(".$filenameinfo['filename']."\_image[^>^\"]*)\"[^>]*)>/i", $string, $imgs); - foreach ($imgs[2] as $img) { - $imagename = basename($img); - foreach ($files as $file) { - if ($imagename === $file->get_filename()) { - $page->images[] = clone($file); - } - } - } - - $matches = array(); - // this will look for a non nested tag that is closed - // want to allow (maybe more) tags but when we do that - // the preg_match messes up. - preg_match_all("/(<([\w]+)[^>]*>)([^<\\2>]*)(<\/\\2>)/", $string, $matches); - $countmatches = count($matches[1]); - for($i = 0; $i < $countmatches; $i++) { // go through all of our div matches - - $class = lesson_importppt_isolate_class($matches[1][$i]); // first step in isolating the class - - // check for any static classes - switch ($class) { - case 'T': // class T is used for Titles - $page->title = $matches[3][$i]; - break; - case 'B': // I would guess that all bullet lists would start with B then go to B1, B2, etc - case 'B1': // B1-B4 are just insurance, should just hit B and all be taken care of - case 'B2': - case 'B3': - case 'B4': - $page->contents[] = lesson_importppt_build_list($matches, '
        ', $i, 0); // this is a recursive function that will grab all the bullets and rebuild the list in html - break; - default: - if ($matches[3][$i] != ' ') { // odd crap generated... sigh - if (substr($matches[3][$i], 0, 1) == ':') { // check for leading : ... hate MS ... - $page->contents[] = substr($matches[3][$i], 1); // get rid of : - } else { - $page->contents[] = $matches[3][$i]; - } - } - break; - } - } - $pages[] = $page; - } - - $branchtables = lesson_create_objects($pages, $lesson->id); - - // first set up the prevpageid and nextpageid - if (empty($pageid)) { // adding it to the top of the lesson - $prevpageid = 0; - // get the id of the first page. If not found, then no pages in the lesson - if (!$nextpageid = $DB->get_field('lesson_pages', 'id', array('prevpageid' => 0, 'lessonid' => $lesson->id))) { - $nextpageid = 0; - } - } else { - // going after an actual page - $prevpageid = $pageid; - $nextpageid = $DB->get_field('lesson_pages', 'nextpageid', array('id' => $pageid)); - } - - foreach ($branchtables as $branchtable) { - - // set the doubly linked list - $branchtable->page->nextpageid = $nextpageid; - $branchtable->page->prevpageid = $prevpageid; - - // insert the page - $id = $DB->insert_record('lesson_pages', $branchtable->page); - - if (!empty($branchtable->page->images)) { - $changes = array('contextid'=>$context->id, 'component'=>'mod_lesson', 'filearea'=>'page_contents', 'itemid'=>$id, 'timemodified'=>time()); - foreach ($branchtable->page->images as $image) { - $fs->create_file_from_storedfile($changes, $image); - } - } - - // update the link of the page previous to the one we just updated - if ($prevpageid != 0) { // if not the first page - $DB->set_field("lesson_pages", "nextpageid", $id, array("id" => $prevpageid)); - } - - // insert the answers - foreach ($branchtable->answers as $answer) { - $answer->pageid = $id; - $DB->insert_record('lesson_answers', $answer); - } - - $prevpageid = $id; - } - - // all done with inserts. Now check to update our last page (this is when we import between two lesson pages) - if ($nextpageid != 0) { // if the next page is not the end of lesson - $DB->set_field("lesson_pages", "prevpageid", $id, array("id" => $nextpageid)); - } - } - - // Remove all unzipped files! - $fs->delete_area_files($context->id, 'mod_lesson', 'imported_files', $lesson->id); - - redirect("$CFG->wwwroot/mod/$modname/view.php?id=$cm->id", get_string('pptsuccessfullimport', 'lesson'), 5); -} - -$PAGE->navbar->add($strimportppt); -$PAGE->set_title($strimportppt); -$PAGE->set_heading($strimportppt); -echo $OUTPUT->header(); - -/// Print upload form -echo $OUTPUT->heading_with_help($strimportppt, 'importppt', 'lesson'); -echo $OUTPUT->box_start('generalbox boxaligncenter'); -$mform->display(); -echo $OUTPUT->box_end(); -echo $OUTPUT->footer(); diff --git a/mod/lesson/importpptlib.php b/mod/lesson/importpptlib.php deleted file mode 100644 index 8550e61..0000000 --- a/mod/lesson/importpptlib.php +++ /dev/null @@ -1,236 +0,0 @@ -. - -/** - * Contains functions used by importppt.php that naturally pertain to importing - * powerpoint presentations into the lesson module - * - * @package mod - * @subpackage lesson - * @copyright 2009 Sam Hemelryk - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - **/ - -defined('MOODLE_INTERNAL') || die(); - -/** - * A recursive function to build a html list - * - * @param array $matches - * @param string $list - * @param int $i - * @param int $depth - * @return string - */ -function lesson_importppt_build_list(array &$matches, $list, &$i, $depth) { - while($i < count($matches[1])) { - - $class = lesson_importppt_isolate_class($matches[1][$i]); - - if (strstr($class, 'B')) { // make sure we are still working with bullet classes - if ($class == 'B') { - $this_depth = 0; // calling class B depth 0 - } else { - // set the depth number. So B1 is depth 1 and B2 is depth 2 and so on - $this_depth = substr($class, 1); - if (!is_numeric($this_depth)) { - print_error('invalidnum'); - } - } - if ($this_depth < $depth) { - // we are moving back a level in the nesting - break; - } - if ($this_depth > $depth) { - // we are moving in a lvl in nesting - $list .= '
          '; - $list = lesson_importppt_build_list($matches, $list, $i, $this_depth); - // once we return back, should go to the start of the while - continue; - } - // no depth changes, so add the match to our list - if ($cleanstring = lesson_importppt_clean_text($matches[3][$i])) { - $list .= '
        • '.lesson_importppt_clean_text($matches[3][$i]).'
          • '; - } - $i++; - } else { - // not a B class, so get out of here... - break; - } - } - // end the list and return it - $list .= '
        '; - return $list; - -} - -/** - * Given an html tag, this function will - * - * @param string $string - * @return string - */ -function lesson_importppt_isolate_class($string) { - if($class = strstr($string, 'class=')) { // first step in isolating the class - $class = substr($class, strpos($class, '=')+1); // this gets rid of
        - return substr($class, 0, strpos($class, '>')); - } - } else { - // no class defined in the tag - return ''; - } -} - -/** - * This function strips off the random chars that ppt puts infront of bullet lists - * - * @param string $string - * @return string - */ -function lesson_importppt_clean_text($string) { - $chop = 1; // default: just a single char infront of the content - - // look for any other crazy things that may be infront of the content - if (strstr($string, '<') and strpos($string, '<') == 0) { // look for the < in the sting and make sure it is in the front - $chop = 4; // increase the $chop - } - // may need to add more later.... - - $string = substr($string, $chop); - - if ($string != ' ') { - return $string; - } else { - return false; - } -} - -/** - * Creates objects an object with the page and answers that are to be inserted into the database - * - * @param array $pageobjects - * @param int $lessonid - * @return array - */ -function lesson_create_objects($pageobjects, $lessonid) { - - $branchtables = array(); - $branchtable = new stdClass; - - // all pages have this info - $page = new stdClass(); - $page->lessonid = $lessonid; - $page->prevpageid = 0; - $page->nextpageid = 0; - $page->qtype = LESSON_PAGE_BRANCHTABLE; - $page->qoption = 0; - $page->layout = 1; - $page->display = 1; - $page->timecreated = time(); - $page->timemodified = 0; - - // all answers are the same - $answer = new stdClass(); - $answer->lessonid = $lessonid; - $answer->jumpto = LESSON_NEXTPAGE; - $answer->grade = 0; - $answer->score = 0; - $answer->flags = 0; - $answer->timecreated = time(); - $answer->timemodified = 0; - $answer->answer = "Next"; - $answer->response = ""; - - $answers[] = clone($answer); - - $answer->jumpto = LESSON_PREVIOUSPAGE; - $answer->answer = "Previous"; - - $answers[] = clone($answer); - - $branchtable->answers = $answers; - - $i = 1; - - foreach ($pageobjects as $pageobject) { - if ($pageobject->title == '') { - $page->title = "Page $i"; // no title set so make a generic one - } else { - $page->title = $pageobject->title; - } - $page->contents = ''; - - // nab all the images first - $page->images = $pageobject->images; - foreach ($page->images as $image) { - $imagetag = ''; - $imagetag = str_replace("\n", '', $imagetag); - $imagetag = str_replace("\r", '', $imagetag); - $imagetag = str_replace("'", '"', $imagetag); // imgstyle - $page->contents .= $imagetag; - } - // go through the contents array and put

        tags around each element and strip out \n which I have found to be unneccessary - foreach ($pageobject->contents as $content) { - $content = str_replace("\n", '', $content); - $content = str_replace("\r", '', $content); - $content = str_replace(' ', '', $content); // puts in returns? - $content = '

        '.$content.'

        '; - $page->contents .= $content; - } - - $branchtable->page = clone($page); // add the page - $branchtables[] = clone($branchtable); // add it all to our array - $i++; - } - - return $branchtables; -} - -/** - * Form displayed to the user asking them to select a file to upload - * - * @copyright 2009 Sam Hemelryk - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class lesson_importppt_form extends moodleform { - - public function definition() { - global $COURSE; - - $mform = $this->_form; - - $mform->addElement('hidden', 'id'); - $mform->setType('id', PARAM_INT); - - $mform->addElement('hidden', 'pageid'); - $mform->setType('pageid', PARAM_INT); - - $filepickeroptions = array(); - $filepickeroptions['filetypes'] = array('*.zip'); - $filepickeroptions['maxbytes'] = $COURSE->maxbytes; - $mform->addElement('filepicker', 'pptzip', get_string('upload'), null, $filepickeroptions); - $mform->addRule('pptzip', null, 'required', null, 'client'); - - $this->add_action_buttons(null, get_string("uploadthisfile")); - } - -} \ No newline at end of file diff --git a/mod/lesson/renderer.php b/mod/lesson/renderer.php index 765b7ca..a37f40b 100644 --- a/mod/lesson/renderer.php +++ b/mod/lesson/renderer.php @@ -364,9 +364,6 @@ class mod_lesson_renderer extends plugin_renderer_base { $importquestionsurl = new moodle_url('/mod/lesson/import.php',array('id'=>$this->page->cm->id, 'pageid'=>$prevpageid)); $links[] = html_writer::link($importquestionsurl, get_string('importquestions', 'lesson')); - $importppturl = new moodle_url('/mod/lesson/importppt.php',array('id'=>$this->page->cm->id, 'pageid'=>$prevpageid)); - $links[] = html_writer::link($importppturl, get_string('importppt', 'lesson')); - $manager = lesson_page_type_manager::get($lesson); foreach ($manager->get_add_page_type_links($prevpageid) as $link) { $link['addurl']->param('firstpage', 1); -- 1.7.9.5 From 84b3cbab33b27774018c6e2593ae75179537f4fe Mon Sep 17 00:00:00 2001 From: Jonathan Harker Date: Fri, 12 Oct 2012 13:31:47 +1300 Subject: [PATCH 802/903] MDL-36015 lib/bennu: use static functions correctly. --- lib/bennu/bennu.class.php | 4 ++-- lib/bennu/iCalendar_parameters.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bennu/bennu.class.php b/lib/bennu/bennu.class.php index 57d643f..b278c14 100644 --- a/lib/bennu/bennu.class.php +++ b/lib/bennu/bennu.class.php @@ -13,14 +13,14 @@ */ class Bennu { - function timestamp_to_datetime($t = NULL) { + static function timestamp_to_datetime($t = NULL) { if($t === NULL) { $t = time(); } return gmstrftime('%Y%m%dT%H%M%SZ', $t); } - function generate_guid() { + static function generate_guid() { // Implemented as per the Network Working Group draft on UUIDs and GUIDs // These two octets get special treatment diff --git a/lib/bennu/iCalendar_parameters.php b/lib/bennu/iCalendar_parameters.php index 6614b39..d264083 100644 --- a/lib/bennu/iCalendar_parameters.php +++ b/lib/bennu/iCalendar_parameters.php @@ -14,7 +14,7 @@ */ class iCalendar_parameter { - function multiple_values_allowed($parameter) { + static function multiple_values_allowed($parameter) { switch($parameter) { case 'DELEGATED-FROM': case 'DELEGATED-TO': @@ -25,7 +25,7 @@ class iCalendar_parameter { } } - function default_value($parameter) { + static function default_value($parameter) { switch($parameter) { case 'CUTYPE': return 'INDIVIDUAL'; case 'FBTYPE': return 'BUSY'; @@ -38,7 +38,7 @@ class iCalendar_parameter { } } - function is_valid_value(&$parent_property, $parameter, $value) { + static function is_valid_value(&$parent_property, $parameter, $value) { switch($parameter) { // These must all be a URI case 'ALTREP': @@ -191,7 +191,7 @@ class iCalendar_parameter { } } - function do_value_formatting($parameter, $value) { + static function do_value_formatting($parameter, $value) { switch($parameter) { // Parameters of type CAL-ADDRESS or URI MUST be double-quoted case 'ALTREP': @@ -232,7 +232,7 @@ class iCalendar_parameter { } } - function undo_value_formatting($parameter, $value) { + static function undo_value_formatting($parameter, $value) { } } -- 1.7.9.5 From 0e8aa5027eb7cb2bfa66e55f164c2d3409a8e02b Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 12 Oct 2012 11:58:11 +0800 Subject: [PATCH 803/903] MDL-35726: Use a different form identifier for each form when using "Save and next" This prevents a bug where the next student feedback will default to the values that were on the last submitted form. This is a similar case to having multiple instances of the same form on the same page - each one needs a unique identifier to distinguish between them. In this case I include the $rownum which changes as you go to each student in the list. --- mod/assign/gradeform.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mod/assign/gradeform.php b/mod/assign/gradeform.php index 8f73ac1..366d5d8 100644 --- a/mod/assign/gradeform.php +++ b/mod/assign/gradeform.php @@ -60,6 +60,17 @@ class mod_assign_grade_form extends moodleform { } /** + * This is required so when using "Save and next", each form is not defaulted to the previous form. + * Giving each form a unique identitifer is enough to prevent this (include the rownum in the form name). + * + * @return string - The unique identifier for this form. + */ + protected function get_form_identifier() { + $params = $this->_customdata[2]; + return get_class($this) . '_' . $params['rownum']; + } + + /** * Perform minimal validation on the grade form * @param array $data * @param array $files -- 1.7.9.5 From cc3f17d86d232e7b122e714bcd339d78a3ad23c2 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Fri, 12 Oct 2012 22:57:39 +0100 Subject: [PATCH 804/903] MDL-35986 theme_canvas: add custommenu and block-region to layout files general.php, frontpage.php and report.php to fix regression in theme/serenity since MDL-33110. --- theme/canvas/layout/frontpage.php | 135 ++++++++++++++++++++----------------- theme/canvas/layout/general.php | 30 ++++++--- theme/canvas/layout/report.php | 24 +++++-- 3 files changed, 111 insertions(+), 78 deletions(-) diff --git a/theme/canvas/layout/frontpage.php b/theme/canvas/layout/frontpage.php index a8b573d..c2d54c8 100644 --- a/theme/canvas/layout/frontpage.php +++ b/theme/canvas/layout/frontpage.php @@ -1,19 +1,24 @@ heading); -$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); -$hasfooter = (empty($PAGE->layout_options['nofooter'])); $hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); +$showsidepre = $hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT); +$showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT); + +$custommenu = $OUTPUT->custom_menu(); +$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); $bodyclasses = array(); -if ($hassidepre && !$hassidepost) { +if ($showsidepre && !$showsidepost) { $bodyclasses[] = 'side-pre-only'; -} else if ($hassidepost && !$hassidepre) { +} else if ($showsidepost && !$showsidepre) { $bodyclasses[] = 'side-post-only'; -} else if (!$hassidepost && !$hassidepre) { +} else if (!$showsidepost && !$showsidepre) { $bodyclasses[] = 'content-only'; } +if ($hascustommenu) { + $bodyclasses[] = 'has_custom_menu'; +} echo $OUTPUT->doctype() ?> htmlattributes() ?>> @@ -30,20 +35,24 @@ echo $OUTPUT->doctype() ?> -
        - -
        -
        -

        heading ?>

        -
        - login_info(); - echo $OUTPUT->lang_menu(); - echo $PAGE->headingmenu; - ?> -
        -
        -
        +
        + +
        +
        +

        heading ?>

        +
        + login_info(); + echo $OUTPUT->lang_menu(); + echo $PAGE->headingmenu; + ?> +
        +
        +
        + + +
        +
        @@ -51,60 +60,60 @@ echo $OUTPUT->doctype() ?> -
        -
        -
        -
        - -
        -
        -
        - main_content() ?> -
        -
        -
        - - -
        -
        - blocks_for_region('side-pre') ?> -
        -
        - - - -
        -
        - blocks_for_region('side-post') ?> -
        -
        - - -
        -
        -
        -
        +
        +
        +
        +
        + +
        +
        +
        + main_content() ?> +
        +
        +
        + + +
        +
        + blocks_for_region('side-pre') ?> +
        +
        + + + +
        +
        + blocks_for_region('side-post') ?> +
        +
        + + +
        +
        +
        +
        -
        -

        +
        +

        - login_info(); - echo $OUTPUT->home_link(); - echo $OUTPUT->standard_footer_html(); - ?> -
        + login_info(); + echo $OUTPUT->home_link(); + echo $OUTPUT->standard_footer_html(); + ?> +
        -
        +
        standard_end_of_body_html() ?> - \ No newline at end of file + diff --git a/theme/canvas/layout/general.php b/theme/canvas/layout/general.php index cda6005..5261314 100644 --- a/theme/canvas/layout/general.php +++ b/theme/canvas/layout/general.php @@ -3,17 +3,27 @@ $hasheading = ($PAGE->heading); $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); $hasfooter = (empty($PAGE->layout_options['nofooter'])); -$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); -$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); +$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); +$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); +$haslogininfo = (empty($PAGE->layout_options['nologininfo'])); + +$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); +$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); + +$custommenu = $OUTPUT->custom_menu(); +$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); $bodyclasses = array(); -if ($hassidepre && !$hassidepost) { +if ($showsidepre && !$showsidepost) { $bodyclasses[] = 'side-pre-only'; -} else if ($hassidepost && !$hassidepre) { +} else if ($showsidepost && !$showsidepre) { $bodyclasses[] = 'side-post-only'; -} else if (!$hassidepost && !$hassidepre) { +} else if (!$showsidepost && !$showsidepre) { $bodyclasses[] = 'content-only'; } +if ($hascustommenu) { + $bodyclasses[] = 'has_custom_menu'; +} echo $OUTPUT->doctype() ?> htmlattributes() ?>> @@ -49,6 +59,10 @@ echo $OUTPUT->doctype() ?>
      + +
      + +
      navbar(); ?>
      @@ -76,7 +90,7 @@ echo $OUTPUT->doctype() ?>
      -
      +
      blocks_for_region('side-pre') ?>
      @@ -84,7 +98,7 @@ echo $OUTPUT->doctype() ?> -
      +
      blocks_for_region('side-post') ?>
      @@ -119,4 +133,4 @@ echo $OUTPUT->doctype() ?> standard_end_of_body_html() ?> - \ No newline at end of file + diff --git a/theme/canvas/layout/report.php b/theme/canvas/layout/report.php index fce6e89..06607e3 100644 --- a/theme/canvas/layout/report.php +++ b/theme/canvas/layout/report.php @@ -3,17 +3,23 @@ $hasheading = ($PAGE->heading); $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); $hasfooter = (empty($PAGE->layout_options['nofooter'])); -$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT); -$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT); +$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); +$haslogininfo = (empty($PAGE->layout_options['nologininfo'])); + +$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); + +$custommenu = $OUTPUT->custom_menu(); +$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); $bodyclasses = array(); -if ($hassidepre && !$hassidepost) { +if ($showsidepre ) { $bodyclasses[] = 'side-pre-only'; -} else if ($hassidepost && !$hassidepre) { - $bodyclasses[] = 'side-post-only'; -} else if (!$hassidepost && !$hassidepre) { +} else { $bodyclasses[] = 'content-only'; } +if ($hascustommenu) { + $bodyclasses[] = 'has_custom_menu'; +} echo $OUTPUT->doctype() ?> htmlattributes() ?>> @@ -49,6 +55,10 @@ echo $OUTPUT->doctype() ?>
      + +
      + +
      navbar(); ?>
      @@ -106,4 +116,4 @@ echo $OUTPUT->doctype() ?> standard_end_of_body_html() ?> - \ No newline at end of file + -- 1.7.9.5 From 7358b1742f4e416e0cca05166e098d55389a1ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 9 Oct 2012 23:04:51 +0200 Subject: [PATCH 805/903] MDL-35854 fix username generator This eliminates infinite loop and also fixes potentially invalid email derived from usernames created from unicode first/last name. --- lib/phpunit/classes/data_generator.php | 6 ++++-- lib/phpunit/tests/generator_test.php | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/phpunit/classes/data_generator.php b/lib/phpunit/classes/data_generator.php index 8225f23..8bfd798 100644 --- a/lib/phpunit/classes/data_generator.php +++ b/lib/phpunit/classes/data_generator.php @@ -156,9 +156,11 @@ EOD; } if (!isset($record['username'])) { - $record['username'] = textlib::strtolower($record['firstname']).textlib::strtolower($record['lastname']); + $record['username'] = 'username'.$i; + $j = 2; while ($DB->record_exists('user', array('username'=>$record['username'], 'mnethostid'=>$record['mnethostid']))) { - $record['username'] = $record['username'].'_'.$i; + $record['username'] = 'username'.$i.'_'.$j; + $j++; } } diff --git a/lib/phpunit/tests/generator_test.php b/lib/phpunit/tests/generator_test.php index 316ee70..3787b34 100644 --- a/lib/phpunit/tests/generator_test.php +++ b/lib/phpunit/tests/generator_test.php @@ -44,6 +44,11 @@ class core_phpunit_generator_testcase extends advanced_testcase { $count = $DB->count_records('user'); $user = $generator->create_user(); $this->assertEquals($count+1, $DB->count_records('user')); + $this->assertSame($user->username, clean_param($user->username, PARAM_USERNAME)); + $this->assertSame($user->email, clean_param($user->email, PARAM_EMAIL)); + $user = $generator->create_user(array('firstname'=>'Žluťoučký', 'lastname'=>'Koníček')); + $this->assertSame($user->username, clean_param($user->username, PARAM_USERNAME)); + $this->assertSame($user->email, clean_param($user->email, PARAM_EMAIL)); $count = $DB->count_records('course_categories'); $category = $generator->create_category(); -- 1.7.9.5 From ad7d20c3803f9f373cb3780acc72badb6aacdfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 9 Oct 2012 14:50:13 +0200 Subject: [PATCH 806/903] MDL-35469 fix Gecko based browser checks The problem is that latest firefox versions stopped using dates because they lost the meaning over the time. --- lib/moodlelib.php | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 167a653..ce332ff 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -8393,18 +8393,45 @@ function check_php_version($version='5.2.4') { case 'Gecko': /// Gecko based browsers - if (empty($version) and substr_count($agent, 'Camino')) { - // MacOS X Camino support - $version = 20041110; + // Do not look for dates any more, we expect real Firefox version here. + if (empty($version)) { + $version = 1; + } else if ($version > 20000000) { + // This is just a guess, it is not supposed to be 100% accurate! + if (preg_match('/^201/', $version)) { + $version = 3.6; + } else if (preg_match('/^200[7-9]/', $version)) { + $version = 3; + } else if (preg_match('/^2006/', $version)) { + $version = 2; + } else { + $version = 1.5; + } } - - // the proper string - Gecko/CCYYMMDD Vendor/Version - // Faster version and work-a-round No IDN problem. - if (preg_match("/Gecko\/([0-9]+)/i", $agent, $match)) { - if ($match[1] > $version) { - return true; + if (preg_match("/(Iceweasel|Firefox)\/([0-9\.]+)/i", $agent, $match)) { + // Use real Firefox version if specified in user agent string. + if (version_compare($match[2], $version) >= 0) { + return true; + } + } else if (preg_match("/Gecko\/([0-9\.]+)/i", $agent, $match)) { + // Gecko might contain date or Firefox revision, let's just guess the Firefox version from the date. + $browserver = $match[1]; + if ($browserver > 20000000) { + // This is just a guess, it is not supposed to be 100% accurate! + if (preg_match('/^201/', $browserver)) { + $browserver = 3.6; + } else if (preg_match('/^200[7-9]/', $browserver)) { + $browserver = 3; + } else if (preg_match('/^2006/', $version)) { + $browserver = 2; + } else { + $browserver = 1.5; } } + if (version_compare($browserver, $version) >= 0) { + return true; + } + } break; -- 1.7.9.5 From a4848f6ef76b6e165397e9d51faf88706a4e4dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 9 Oct 2012 15:48:27 +0200 Subject: [PATCH 807/903] MDL-35469 test for the new Gecko user agent handling --- lib/tests/moodlelib_test.php | 120 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php index 6beb856..521252a 100644 --- a/lib/tests/moodlelib_test.php +++ b/lib/tests/moodlelib_test.php @@ -49,8 +49,17 @@ class moodlelib_testcase extends advanced_testcase { '1.5' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; nl; rv:1.8) Gecko/20051107 Firefox/1.5'), '1.5.0.1' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.0.1) Gecko/20060111 Firefox/1.5.0.1'), '2.0' => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.1) Gecko/20061204 Firefox/2.0.0.1', - 'Ubuntu Linux AMD64' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1) Gecko/20060601 Firefox/2.0 (Ubuntu-edgy)'), - '3.0.6' => array('SUSE' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.6) Gecko/2009012700 SUSE/3.0.6-1.4 Firefox/3.0.6'), + 'Ubuntu Linux AMD64' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1) Gecko/20060601 Firefox/2.0 (Ubuntu-edgy)'), + '3.0.6' => array('SUSE' => 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.6) Gecko/2009012700 SUSE/3.0.6-1.4 Firefox/3.0.6'), + '3.6' => array('Linux' => 'Mozilla/5.0 (X11; Linux i686; rv:2.0) Gecko/20100101 Firefox/3.6'), + '11.0' => array('Windows' => 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:11.0) Gecko Firefox/11.0'), + '15.0a2' => array('Windows' => 'Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2'), + '18.0' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:18.0) Gecko/18.0 Firefox/18.0'), + ), + 'SeaMonkey' => array( + '2.0' => array('Windows' => 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1b3pre) Gecko/20081208 SeaMonkey/2.0'), + '2.1' => array('Linux' => 'Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) Gecko/20110609 Firefox/4.0.1 SeaMonkey/2.1'), + '2.3' => array('FreeBSD' => 'Mozilla/5.0 (X11; FreeBSD amd64; rv:6.0) Gecko/20110818 Firefox/6.0 SeaMonkey/2.3'), ), 'Safari' => array( '312' => array('Mac OS X' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/312.1 (KHTML, like Gecko) Safari/312'), @@ -248,6 +257,113 @@ class moodlelib_testcase extends advanced_testcase { $this->assertTrue(check_browser_version('Firefox')); $this->assertTrue(check_browser_version('Firefox', '1.5')); $this->assertFalse(check_browser_version('Firefox', '3.0')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['1.0.6']['Windows XP']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Gecko', '1')); + $this->assertFalse(check_browser_version('Gecko', 20030516)); + $this->assertFalse(check_browser_version('Gecko', 20051106)); + $this->assertFalse(check_browser_version('Gecko', 2006010100)); + $this->assertFalse(check_browser_version('Firefox', '1.5')); + $this->assertFalse(check_browser_version('Firefox', '3.0')); + $this->assertFalse(check_browser_version('Gecko', '2')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['2.0']['Windows XP']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', '1.5')); + $this->assertTrue(check_browser_version('Gecko', '1')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertFalse(check_browser_version('Firefox', '3.0')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['3.6']['Linux']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', '1.5')); + $this->assertTrue(check_browser_version('Firefox', '3.0')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', '3.6')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertFalse(check_browser_version('Firefox', '4')); + $this->assertFalse(check_browser_version('Firefox', '10')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['3.6']['Linux']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', '1.5')); + $this->assertTrue(check_browser_version('Firefox', '3.0')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', '3.6')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertFalse(check_browser_version('Firefox', '4')); + $this->assertFalse(check_browser_version('Firefox', '10')); + $this->assertFalse(check_browser_version('Firefox', '18')); + $this->assertFalse(check_browser_version('Gecko', '4')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['15.0a2']['Windows']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', '1.5')); + $this->assertTrue(check_browser_version('Firefox', '3.0')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', '3.6')); + $this->assertTrue(check_browser_version('Gecko', '15.0')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertTrue(check_browser_version('Firefox', '4')); + $this->assertTrue(check_browser_version('Firefox', '10')); + $this->assertTrue(check_browser_version('Firefox', '15')); + $this->assertFalse(check_browser_version('Firefox', '18')); + $this->assertFalse(check_browser_version('Gecko', '18')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['Firefox']['18.0']['Mac OS X']; + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', '1.5')); + $this->assertTrue(check_browser_version('Firefox', '3.0')); + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', '3.6')); + $this->assertTrue(check_browser_version('Gecko', '15.0')); + $this->assertTrue(check_browser_version('Gecko', '18.0')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertTrue(check_browser_version('Firefox', '4')); + $this->assertTrue(check_browser_version('Firefox', '10')); + $this->assertTrue(check_browser_version('Firefox', '15')); + $this->assertTrue(check_browser_version('Firefox', '18')); + $this->assertFalse(check_browser_version('Firefox', '19')); + $this->assertFalse(check_browser_version('Gecko', '19')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['SeaMonkey']['2.0']['Windows']; + + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertFalse(check_browser_version('Gecko', '3.6')); + $this->assertFalse(check_browser_version('Gecko', '4.0')); + $this->assertFalse(check_browser_version('Firefox')); + + $_SERVER['HTTP_USER_AGENT'] = $this->user_agents['SeaMonkey']['2.1']['Linux']; + $this->assertTrue(check_browser_version('Gecko', '2')); + $this->assertTrue(check_browser_version('Gecko', '3.6')); + $this->assertTrue(check_browser_version('Gecko', '4.0')); + $this->assertTrue(check_browser_version('Gecko', 20030516)); + $this->assertTrue(check_browser_version('Gecko', 20051106)); + $this->assertTrue(check_browser_version('Gecko', 2006010100)); + $this->assertTrue(check_browser_version('Firefox')); + $this->assertTrue(check_browser_version('Firefox', 4.0)); + $this->assertFalse(check_browser_version('Firefox', 5)); + $this->assertFalse(check_browser_version('Gecko', '18.0')); + } function test_get_browser_version_classes() { -- 1.7.9.5 From b66c3031f63a1a97320767673a9a9f35a4076e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 13 Oct 2012 17:54:30 +0200 Subject: [PATCH 808/903] MDL-35917 fix cohort phpdocs Credit goes to Brian Kremer, thanks! --- cohort/lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cohort/lib.php b/cohort/lib.php index 367b19e..4ab8ab7 100644 --- a/cohort/lib.php +++ b/cohort/lib.php @@ -126,7 +126,7 @@ function cohort_delete_category($category) { } /** - * Remove cohort member + * Add cohort member * @param int $cohortid * @param int $userid * @return void @@ -143,7 +143,7 @@ function cohort_add_member($cohortid, $userid) { } /** - * Add cohort member + * Remove cohort member * @param int $cohortid * @param int $userid * @return void -- 1.7.9.5 From 8d800a1b8e31aa6f57f33f42cce9cb51c8bd7fd1 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 14 Oct 2012 23:22:08 +0200 Subject: [PATCH 809/903] Revert "MDL-31968 Make NTLM REMOTE_USER format configurable by the admin" This reverts commit af861e14dc5c83a5f4d142a0d13de1eb7467349b. Note that MDL-31968 will be in charge of backporting this to stables if everything goes well under master (once MDL-31968 is tested and closed) --- auth/ldap/auth.php | 79 +-------------------------------------- auth/ldap/config.html | 15 -------- auth/ldap/lang/en/auth_ldap.php | 4 -- 3 files changed, 2 insertions(+), 96 deletions(-) diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php index c206452..88bb10d 100644 --- a/auth/ldap/auth.php +++ b/auth/ldap/auth.php @@ -41,18 +41,6 @@ if (!defined('AUTH_GID_NOGROUP')) { define('AUTH_GID_NOGROUP', -2); } -// Regular expressions for a valid NTLM username and domain name. -if (!defined('AUTH_NTLM_VALID_USERNAME')) { - define('AUTH_NTLM_VALID_USERNAME', '[^/\\\\\\\\\[\]:;|=,+*?<>@"]+'); -} -if (!defined('AUTH_NTLM_VALID_DOMAINNAME')) { - define('AUTH_NTLM_VALID_DOMAINNAME', '[^\\\\\\\\\/:*?"<>|]+'); -} -// Default format for remote users if using NTLM SSO -if (!defined('AUTH_NTLM_DEFAULT_FORMAT')) { - define('AUTH_NTLM_DEFAULT_FORMAT', '%domain%\\%username%'); -} - require_once($CFG->libdir.'/authlib.php'); require_once($CFG->libdir.'/ldaplib.php'); @@ -1582,11 +1570,8 @@ class auth_plugin_ldap extends auth_plugin_base { switch ($this->config->ntlmsso_type) { case 'ntlm': - // The format is now configurable, so try to extract the username - $username = $this->get_ntlm_remote_user($username); - if (empty($username)) { - return false; - } + // Format is DOMAIN\username + $username = substr(strrchr($username, '\\'), 1); break; case 'kerberos': // Format is username@DOMAIN @@ -1794,9 +1779,6 @@ class auth_plugin_ldap extends auth_plugin_base { if (!isset($config->ntlmsso_type)) { $config->ntlmsso_type = 'ntlm'; } - if (!isset($config->ntlmsso_remoteuserformat)) { - $config->ntlmsso_remoteuserformat = ''; - } // Try to remove duplicates before storing the contexts (to avoid problems in sync_users()). $config->contexts = explode(';', $config->contexts); @@ -1836,7 +1818,6 @@ class auth_plugin_ldap extends auth_plugin_base { set_config('ntlmsso_subnet', trim($config->ntlmsso_subnet), $this->pluginconfig); set_config('ntlmsso_ie_fastpath', (int)$config->ntlmsso_ie_fastpath, $this->pluginconfig); set_config('ntlmsso_type', $config->ntlmsso_type, 'auth/ldap'); - set_config('ntlmsso_remoteuserformat', trim($config->ntlmsso_remoteuserformat), 'auth/ldap'); return true; } @@ -2037,60 +2018,4 @@ class auth_plugin_ldap extends auth_plugin_base { $this->config->user_attribute, $this->config->search_sub); } - - /** - * A chance to validate form data, and last chance to do stuff - * before it is inserted in config_plugin - * - * @param object object with submitted configuration settings (without system magic quotes) - * @param array $err array of error messages (passed by reference) - */ - function validate_form($form, &$err) { - if ($form->ntlmsso_type == 'ntlm') { - $format = trim($form->ntlmsso_remoteuserformat); - if (!empty($format) && !preg_match('/%username%/i', $format)) { - $err['ntlmsso_remoteuserformat'] = get_string('auth_ntlmsso_missing_username', 'auth_ldap'); - } - } - } - - - /** - * When using NTLM SSO, the format of the remote username we get in - * $_SERVER['REMOTE_USER'] may vary, depending on where from and how the web - * server gets the data. So we let the admin configure the format using two - * place holders (%domain% and %username%). This function tries to extract - * the username (stripping the domain part and any separators if they are - * present) from the value present in $_SERVER['REMOTE_USER'], using the - * configured format. - * - * @param string $remoteuser The value from $_SERVER['REMOTE_USER'] (converted to UTF-8) - * - * @return string The remote username (without domain part or - * separators). Empty string if we can't extract the username. - */ - protected function get_ntlm_remote_user($remoteuser) { - if (empty($this->config->ntlmsso_remoteuserformat)) { - $format = AUTH_NTLM_DEFAULT_FORMAT; - } else { - $format = $this->config->ntlmsso_remoteuserformat; - } - - $format = preg_quote($format); - $formatregex = preg_replace(array('#%domain%#', '#%username%#'), - array('('.AUTH_NTLM_VALID_DOMAINNAME.')', '('.AUTH_NTLM_VALID_USERNAME.')'), - $format); - if (preg_match('#^'.$formatregex.'$#', $remoteuser, $matches)) { - $user = end($matches); - return $user; - } - - /* We are unable to extract the username with the configured format. Probably - * the format specified is wrong, so log a warning for the admin and return - * an empty username. - */ - error_log($this->errorlogtag.get_string ('auth_ntlmsso_maybeinvalidformat', 'auth_ldap')); - return ''; - } - } // End of the class diff --git a/auth/ldap/config.html b/auth/ldap/config.html index 3efe253..8ad27ef 100644 --- a/auth/ldap/config.html +++ b/auth/ldap/config.html @@ -94,9 +94,6 @@ if (!isset($config->ntlmsso_ie_fastpath)) { if (!isset($config->ntlmsso_type)) { $config->ntlmsso_type = 'ntlm'; } -if (!isset($config->ntlmsso_remoteuserformat)) { - $config->ntlmsso_remoteuserformat = ''; -} $yesno = array(get_string('no'), get_string('yes')); @@ -542,18 +539,6 @@ $yesno = array(get_string('no'), get_string('yes')); - - - - - - - error_text($err['ntlmsso_remoteuserformat']); } ?> - - - - - %domain%       placeholder to specify where the domain name appears, and the mandatory %username% placeholder to specify where the username appears.

      Some widely used formats are %domain%\\%username% (MS Windows default), %domain%/%username%, %domain%+%username% and just %username% (if there is no domain part).'; $string['auth_ntlmsso_subnet'] = 'If set, it will only attempt SSO with clients in this subnet. Format: xxx.xxx.xxx.xxx/bitmask. Separate multiple subnets with \',\' (comma).'; $string['auth_ntlmsso_subnet_key'] = 'Subnet'; $string['auth_ntlmsso_type_key'] = 'Authentication type'; -- 1.7.9.5 From 6738413b335155cea349082d57a8781bc9c5fd4a Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 15 Oct 2012 00:20:33 +0200 Subject: [PATCH 810/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index a5b0b9a..4fc7f14 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.05; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.06; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20121005)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20121014)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From 887d6e175e5bf198c3278354f78fe674d6373843 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Mon, 15 Oct 2012 00:34:57 +0000 Subject: [PATCH 811/903] Automatically generated installer lang files --- install/lang/bg/install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/lang/bg/install.php b/install/lang/bg/install.php index f3bdac4..ff283b1 100644 --- a/install/lang/bg/install.php +++ b/install/lang/bg/install.php @@ -51,4 +51,5 @@ $string['pathssubdataroot'] = 'Тази директория е място, къ $string['pathssubdirroot'] = 'Пълен път до директорията на Moodle.'; $string['pathssubwwwroot'] = 'Пълен интернет адрес, на който ще се отваря Moodle. Не е възможно Moodle да се отваря чрез различни адреси. Ако Вашият сайт има няколко адреса трябва на всеки от другите адреси да направите пренасочване към този. Ако Вашият сайт се отваря както глобално от Интернет, така и от локална мрежа, настройте DNS, така че потребителите от локалната мрежа също да могат да ползват глобалния адрес. Ако адресът не е коректен, моля, променете адреса в браузъра си и започнете инсталирането с правилния адрес.'; $string['phpextension'] = '{$a} разширение на PHP'; +$string['phpversionhelp'] = '

      Moodle изисква версия на PHP най-малко 4.3.0 или 5.1.0 (5.0.x има значителен брой известни проблеми).

      Вие използвате в момента версия {$a}

      Трябва да обновите PHP или да се преместите на нов хост (сървър) с по-нова версия на PHP!
      (В случая с 5.0.x може да опитате да инсталирате по-старата версия 4.4.x)

      '; $string['wwwroot'] = 'Уеб адрес'; -- 1.7.9.5 From 82525f5963b2a288dfa9c01201e62dea8bfbc788 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 9 Oct 2012 11:12:37 +0800 Subject: [PATCH 812/903] MDL-35664 filepicker: Filepicker knows about the current path and uses it --- repository/filepicker.js | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/repository/filepicker.js b/repository/filepicker.js index 9654045..5e848cf 100644 --- a/repository/filepicker.js +++ b/repository/filepicker.js @@ -16,6 +16,7 @@ * this.viewmode, store current view mode * this.pathbar, reference to the Node with path bar * this.pathnode, a Node element representing one folder in a path bar (not attached anywhere, just used for template) + * this.currentpath, the current path in the repository (or last requested path) * * Filepicker options: * ===== @@ -39,7 +40,7 @@ * this.filelist, cached filelist * this.pages * this.page - * this.filepath, current path + * this.filepath, current path (each element of the array is a part of the breadcrumb) * this.logindata, cached login form */ @@ -932,6 +933,7 @@ M.core_filepicker.init = function(Y, options) { // save current path and filelist (in case we want to jump to other viewmode) this.filepath = e.node.origpath; this.filelist = e.node.origlist; + this.currentpath = e.node.path; this.print_path(); this.content_scrolled(); } @@ -967,7 +969,6 @@ M.core_filepicker.init = function(Y, options) { if (this.active_repo.dynload) { this.list({'path':node.path}); } else { - this.filepath = node.path; this.filelist = node.children; this.view_files(); } @@ -1002,7 +1003,6 @@ M.core_filepicker.init = function(Y, options) { if (this.active_repo.dynload) { this.list({'path':node.path}); } else { - this.filepath = node.path; this.filelist = node.children; this.view_files(); } @@ -1022,9 +1022,13 @@ M.core_filepicker.init = function(Y, options) { } this.active_repo.nextpagerequested = true; var nextpage = this.active_repo.page+1; - var args = {page:nextpage, repo_id:this.active_repo.id, path:this.active_repo.path}; + var args = { + page: nextpage, + repo_id: this.active_repo.id, + }; var action = this.active_repo.issearchresult ? 'search' : 'list'; this.request({ + path: this.currentpath, scope: this, action: action, client_id: this.options.client_id, @@ -1032,10 +1036,20 @@ M.core_filepicker.init = function(Y, options) { params: args, callback: function(id, obj, args) { var scope = args.scope; - // check that we are still in the same repository and are expecting this page + // Check that we are still in the same repository and are expecting this page. We have no way + // to compare the requested page and the one returned, so we assume that if the last chunk + // of the breadcrumb is similar, then we probably are on the same page. + var samepage = true; + if (obj.path && scope.filepath) { + var pathbefore = scope.filepath[scope.filepath.length-1]; + var pathafter = obj.path[obj.path.length-1]; + if (pathbefore.path != pathafter.path) { + samepage = false; + } + } if (scope.active_repo.hasmorepages && obj.list && obj.page && obj.repo_id == scope.active_repo.id && - obj.page == scope.active_repo.page+1 && obj.path == scope.path) { + obj.page == scope.active_repo.page+1 && samepage) { scope.parse_repository_options(obj, true); scope.view_files(obj.list) } @@ -1564,6 +1578,10 @@ M.core_filepicker.init = function(Y, options) { if (!args.repo_id) { args.repo_id = this.active_repo.id; } + if (!args.path) { + args.path = ''; + } + this.currentpath = args.path; this.request({ action: 'list', client_id: this.options.client_id, @@ -1707,7 +1725,7 @@ M.core_filepicker.init = function(Y, options) { toolbar.one('.fp-tb-refresh').one('a,button').on('click', function(e) { e.preventDefault(); if (!this.active_repo.norefresh) { - this.list(); + this.list({ path: this.currentpath }); } }, this); toolbar.one('.fp-tb-search form'). -- 1.7.9.5 From 4f977aea5e185c933cc0624aa873d4c106a2095e Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 9 Oct 2012 11:01:39 +0800 Subject: [PATCH 813/903] MDL-35892 repository: prepare_listing recursively prepares the data --- repository/lib.php | 115 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 40 deletions(-) diff --git a/repository/lib.php b/repository/lib.php index b416284..f60bed4 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -2018,59 +2018,56 @@ abstract class repository { public function get_listing($path = '', $page = '') { } + /** - * Prepares list of files before passing it to AJAX, makes sure data is in the correct - * format and stores formatted values. + * Prepare the breadcrumb. * - * @param array|stdClass $listing result of get_listing() or search() or file_get_drafarea_files() - * @return array + * @param array $breadcrumb contains each element of the breadcrumb. + * @return array of breadcrumb elements. + * @since 2.3.3 */ - public static function prepare_listing($listing) { + protected static function prepare_breadcrumb($breadcrumb) { global $OUTPUT; - - $defaultfoldericon = $OUTPUT->pix_url(file_folder_icon(24))->out(false); - // prepare $listing['path'] or $listing->path - if (is_array($listing) && isset($listing['path']) && is_array($listing['path'])) { - $path = &$listing['path']; - } else if (is_object($listing) && isset($listing->path) && is_array($listing->path)) { - $path = &$listing->path; - } - if (isset($path)) { - $len = count($path); - for ($i=0; $i<$len; $i++) { - if (is_array($path[$i]) && !isset($path[$i]['icon'])) { - $path[$i]['icon'] = $defaultfoldericon; - } else if (is_object($path[$i]) && !isset($path[$i]->icon)) { - $path[$i]->icon = $defaultfoldericon; - } + $foldericon = $OUTPUT->pix_url(file_folder_icon(24))->out(false); + $len = count($breadcrumb); + for ($i = 0; $i < $len; $i++) { + if (is_array($breadcrumb[$i]) && !isset($breadcrumb[$i]['icon'])) { + $breadcrumb[$i]['icon'] = $foldericon; + } else if (is_object($breadcrumb[$i]) && !isset($breadcrumb[$i]->icon)) { + $breadcrumb[$i]->icon = $foldericon; } } + return $breadcrumb; + } - // prepare $listing['list'] or $listing->list - if (is_array($listing) && isset($listing['list']) && is_array($listing['list'])) { - $listing['list'] = array_values($listing['list']); // convert to array - $files = &$listing['list']; - } else if (is_object($listing) && isset($listing->list) && is_array($listing->list)) { - $listing->list = array_values($listing->list); // convert to array - $files = &$listing->list; - } else { - return $listing; - } - $len = count($files); - for ($i=0; $i<$len; $i++) { - if (is_object($files[$i])) { - $file = (array)$files[$i]; + /** + * Prepare the file/folder listing. + * + * @param array $list of files and folders. + * @return array of files and folders. + * @since 2.3.3 + */ + protected static function prepare_list($list) { + global $OUTPUT; + $foldericon = $OUTPUT->pix_url(file_folder_icon(24))->out(false); + + // Reset the array keys because non-numeric keys will create an object when converted to JSON. + $list = array_values($list); + + $len = count($list); + for ($i = 0; $i < $len; $i++) { + if (is_object($list[$i])) { + $file = (array)$list[$i]; $converttoobject = true; } else { - $file = & $files[$i]; + $file =& $list[$i]; $converttoobject = false; } if (isset($file['size'])) { $file['size'] = (int)$file['size']; $file['size_f'] = display_size($file['size']); } - if (isset($file['license']) && - get_string_manager()->string_exists($file['license'], 'license')) { + if (isset($file['license']) && get_string_manager()->string_exists($file['license'], 'license')) { $file['license_f'] = get_string($file['license'], 'license'); } if (isset($file['image_width']) && isset($file['image_height'])) { @@ -2105,15 +2102,53 @@ abstract class repository { } if (!isset($file['icon'])) { if ($isfolder) { - $file['icon'] = $defaultfoldericon; + $file['icon'] = $foldericon; } else if ($filename) { $file['icon'] = $OUTPUT->pix_url(file_extension_icon($filename, 24))->out(false); } } + + // Recursively loop over children. + if (isset($file['children'])) { + $file['children'] = self::prepare_list($file['children']); + } + + // Convert the array back to an object. if ($converttoobject) { - $files[$i] = (object)$file; + $list[$i] = (object)$file; } } + return $list; + } + + /** + * Prepares list of files before passing it to AJAX, makes sure data is in the correct + * format and stores formatted values. + * + * @param array|stdClass $listing result of get_listing() or search() or file_get_drafarea_files() + * @return array + */ + public static function prepare_listing($listing) { + $wasobject = false; + if (is_object($listing)) { + $listing = (array) $listing; + $wasobject = true; + } + + // Prepare the breadcrumb, passed as 'path'. + if (isset($listing['path']) && is_array($listing['path'])) { + $listing['path'] = self::prepare_breadcrumb($listing['path']); + } + + // Prepare the listing of objects. + if (isset($listing['list']) && is_array($listing['list'])) { + $listing['list'] = self::prepare_list($listing['list']); + } + + // Convert back to an object. + if ($wasobject) { + $listing = (object) $listing; + } return $listing; } -- 1.7.9.5 From 4981d1242011f0360640b6b4f4bee6b7b4f07174 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Mon, 15 Oct 2012 10:56:34 +0800 Subject: [PATCH 814/903] MDL-35889 blocks: Adding a legend to the fieldset --- blocks/search_forums/block_search_forums.php | 1 + 1 file changed, 1 insertion(+) diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php index cf22705..0e780f1 100644 --- a/blocks/search_forums/block_search_forums.php +++ b/blocks/search_forums/block_search_forums.php @@ -27,6 +27,7 @@ class block_search_forums extends block_base { $this->content->text = '
      '; $this->content->text .= '
      '; + $this->content->text .= ''.$strsearch.''; $this->content->text .= ''; // course $this->content->text .= ''. ''; -- 1.7.9.5 From 46ba9fded8ac1c4abd20f9b760612fc3b7705ffd Mon Sep 17 00:00:00 2001 From: Mark Nielsen Date: Mon, 15 Oct 2012 16:48:21 +0800 Subject: [PATCH 815/903] MDL-33621 rating: fixed view help error for global scale rating --- lib/outputrenderers.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index dd03dc8..b263027 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1638,7 +1638,13 @@ class core_renderer extends renderer_base { $ratinghtml .= html_writer::empty_tag('input', $attributes); if (!$rating->settings->scale->isnumeric) { - $ratinghtml .= $this->help_icon_scale($rating->settings->scale->courseid, $rating->settings->scale); + // If a global scale, try to find current course ID from the context + if (empty($rating->settings->scale->courseid) and $coursecontext = $rating->context->get_course_context(false)) { + $courseid = $coursecontext->instanceid; + } else { + $courseid = $rating->settings->scale->courseid; + } + $ratinghtml .= $this->help_icon_scale($courseid, $rating->settings->scale); } $ratinghtml .= html_writer::end_tag('span'); $ratinghtml .= html_writer::end_tag('div'); -- 1.7.9.5 From 6e763244ed799bb4eb4fc4f049429f9b99b90f86 Mon Sep 17 00:00:00 2001 From: Mark Nielsen Date: Mon, 15 Oct 2012 17:18:34 +0800 Subject: [PATCH 816/903] MDL-34837 backup: Restore does not fail when some courses have the same name --- backup/util/dbops/restore_dbops.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backup/util/dbops/restore_dbops.class.php b/backup/util/dbops/restore_dbops.class.php index fb7beb3..e856ead 100644 --- a/backup/util/dbops/restore_dbops.class.php +++ b/backup/util/dbops/restore_dbops.class.php @@ -1505,7 +1505,8 @@ abstract class restore_dbops { } $currentfullname = $fullname.$suffixfull; $currentshortname = substr($shortname, 0, 100 - strlen($suffixshort)).$suffixshort; // < 100cc - $coursefull = $DB->get_record_select('course', 'fullname = ? AND id != ?', array($currentfullname, $courseid)); + $coursefull = $DB->get_record_select('course', 'fullname = ? AND id != ?', + array($currentfullname, $courseid), '*', IGNORE_MULTIPLE); $courseshort = $DB->get_record_select('course', 'shortname = ? AND id != ?', array($currentshortname, $courseid)); $counter++; } while ($coursefull || $courseshort); -- 1.7.9.5 From caa0e70577066e4ad96fc58b6125246af0afc63f Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Tue, 9 Oct 2012 15:56:40 +0800 Subject: [PATCH 817/903] MDL-25275 - mod/data - Added a check box to eliminate date searches if desired. --- mod/data/field/date/field.class.php | 26 ++++++++++++++------------ mod/data/lang/en/data.php | 1 + 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mod/data/field/date/field.class.php b/mod/data/field/date/field.class.php index 313058c..2fa245d 100644 --- a/mod/data/field/date/field.class.php +++ b/mod/data/field/date/field.class.php @@ -55,12 +55,13 @@ class data_field_date extends data_field_base { //Enable the following three functions once core API issues have been addressed. function display_search_field($value=0) { - $selectors = html_writer::select_time('days', 'f_'.$this->field->id.'_d', $value) - . html_writer::select_time('months', 'f_'.$this->field->id.'_m', $value) - . html_writer::select_time('years', 'f_'.$this->field->id.'_y', $value); - return $selectors; + $selectors = html_writer::select_time('days', 'f_'.$this->field->id.'_d', $value['timestamp']) + . html_writer::select_time('months', 'f_'.$this->field->id.'_m', $value['timestamp']) + . html_writer::select_time('years', 'f_'.$this->field->id.'_y', $value['timestamp']); + $datecheck = html_writer::checkbox('f_'.$this->field->id.'_z', 1, $value['usedate']); + $str = $selectors . ' ' . $datecheck . ' ' . get_string('usedate', 'data'); - //return print_date_selector('f_'.$this->field->id.'_d', 'f_'.$this->field->id.'_m', 'f_'.$this->field->id.'_y', $value, true); + return $str; } function generate_sql($tablealias, $value) { @@ -70,21 +71,22 @@ class data_field_date extends data_field_base { $i++; $name = "df_date_$i"; $varcharcontent = $DB->sql_compare_text("{$tablealias}.content"); - return array(" ({$tablealias}.fieldid = {$this->field->id} AND $varcharcontent = :$name) ", array($name=>$value)); + return array(" ({$tablealias}.fieldid = {$this->field->id} AND $varcharcontent = :$name) ", array($name => $value['timestamp'])); } function parse_search_field() { - $day = optional_param('f_'.$this->field->id.'_d', 0, PARAM_INT); $month = optional_param('f_'.$this->field->id.'_m', 0, PARAM_INT); $year = optional_param('f_'.$this->field->id.'_y', 0, PARAM_INT); - if (!empty($day) && !empty($month) && !empty($year)) { - return make_timestamp($year, $month, $day, 12, 0, 0, 0, false); - } - else { + $usedate = optional_param('f_'.$this->field->id.'_z', 0, PARAM_INT); + $data = array(); + if (!empty($day) && !empty($month) && !empty($year) && $usedate == 1) { + $data['timestamp'] = make_timestamp($year, $month, $day, 12, 0, 0, 0, false); + $data['usedate'] = 1; + return $data; + } else { return 0; } - } function update_content($recordid, $value, $name='') { diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index ed005e6..53887ec 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -338,6 +338,7 @@ $string['uploadrecords_help'] = 'Entries may be uploaded via text file. The form The field enclosure is a character that surrounds each field in each record. It can normally be left unset.'; $string['uploadrecords_link'] = 'mod/data/import'; $string['url'] = 'Url'; +$string['usedate'] = 'Include in search.'; $string['usestandard'] = 'Use a preset'; $string['usestandard_help'] = 'To use a preset available to the whole site, select it from the list. (If you have added a preset to the list using the save as preset feature then you have the option of deleting it.)'; $string['viewfromdate'] = 'Read only from'; -- 1.7.9.5 From 25ba0f48399d3b115f4007a1f4fb45d4179dbb2b Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 16 Oct 2012 10:26:33 +0800 Subject: [PATCH 818/903] MDL-21801 - mod_lesson: version bump To reflect the new (ppt-less) state --- mod/lesson/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/lesson/version.php b/mod/lesson/version.php index e663af6..d75f2aa 100644 --- a/mod/lesson/version.php +++ b/mod/lesson/version.php @@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die(); -$module->version = 2012061700; // The current module version (Date: YYYYMMDDXX) +$module->version = 2012061701; // The current module version (Date: YYYYMMDDXX) $module->requires = 2012061700; // Requires this Moodle version $module->component = 'mod_lesson'; // Full name of the plugin (used for diagnostics) $module->cron = 0; -- 1.7.9.5 From 0c09da65ce22b788686ab55e23ec7b0ed8ff012d Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Mon, 8 Oct 2012 09:03:49 +0800 Subject: [PATCH 819/903] MDL-35265 - blog - Update code for removing orphaned blog association data. Conflicts: version.php --- lib/db/upgrade.php | 16 ++++++++++++++++ version.php | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index e617e1b..91263db 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -969,5 +969,21 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2012062502.03); } + if ($oldversion < 2012062502.07) { + // Find all orphaned blog associations that might exist. + $sql = "SELECT ba.id + FROM {blog_association} ba + LEFT JOIN {post} p + ON p.id = ba.blogid + WHERE p.id IS NULL"; + $orphanedrecordids = $DB->get_records_sql($sql); + // Now delete these associations. + foreach ($orphanedrecordids as $orphanedrecord) { + $DB->delete_records('blog_association', array('id' => $orphanedrecord->id)); + } + + upgrade_main_savepoint(true, 2012062502.07); + } + return true; } diff --git a/version.php b/version.php index 4fc7f14..e835adf 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.06; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.07; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -- 1.7.9.5 From 672bea4cfea50067cbf7ee86e9d797629b3d6855 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Mon, 15 Oct 2012 16:26:17 +0800 Subject: [PATCH 820/903] MDL-29762 Blocks: Modified checks to show image in html block --- blocks/html/lib.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/blocks/html/lib.php b/blocks/html/lib.php index a2555c3..e0469d3 100644 --- a/blocks/html/lib.php +++ b/blocks/html/lib.php @@ -30,15 +30,32 @@ * @param bool $forcedownload whether or not force download * @param array $options additional options affecting the file serving * @return bool + * @todo MDL-36050 improve capability check on stick blocks, so we can check user capability before sending images. */ function block_html_pluginfile($course, $birecord_or_cm, $context, $filearea, $args, $forcedownload, array $options=array()) { - global $SCRIPT; + global $DB, $CFG; if ($context->contextlevel != CONTEXT_BLOCK) { send_file_not_found(); } - require_course_login($course); + // If block is in course context, then check if user has capability to access course. + if ($context->get_course_context(false)) { + require_course_login($course); + } else if ($CFG->forcelogin) { + require_login(); + } else { + // Get parent context and see if user have proper permission. + $parentcontext = $context->get_parent_context(); + if ($parentcontext->contextlevel === CONTEXT_COURSECAT) { + // Check if category is visible and user can view this category. + $category = $DB->get_record('course_categories', array('id' => $parentcontext->instanceid), '*', MUST_EXIST); + if (!$category->visible) { + require_capability('moodle/category:viewhiddencategories', $parentcontext); + } + } + // At this point there is no way to check SYSTEM or USER context, so ignoring it. + } if ($filearea !== 'content') { send_file_not_found(); -- 1.7.9.5 From 1ffbad6404d8c142cc782818a537ffb7d8e48d69 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Tue, 16 Oct 2012 13:32:34 +0800 Subject: [PATCH 821/903] MDL-33857 fixed up whitespace --- lib/filebrowser/file_info.php | 18 +++++++++--------- lib/filebrowser/file_info_context_course.php | 4 ++-- lib/filebrowser/file_info_context_module.php | 2 +- mod/workshop/fileinfolib.php | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/filebrowser/file_info.php b/lib/filebrowser/file_info.php index 0900d68..a6af3f7 100644 --- a/lib/filebrowser/file_info.php +++ b/lib/filebrowser/file_info.php @@ -115,7 +115,7 @@ abstract class file_info { $likes[] = $DB->sql_like($prefix.'filename', ':filename'.$cnt, false); $params['filename'.$cnt] = '%'.$ext; } - $sql .= ' AND ('.join(' OR ', $likes).')'; + $sql .= ' AND (' . join(' OR ', $likes) . ')'; } return array($sql, $params); } @@ -144,7 +144,7 @@ abstract class file_info { } else { $filename = $fileinfo->get_visible_name(); $extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION)); - if (!empty($extension) && in_array('.'.$extension, $extensions)) { + if (!empty($extension) && in_array('.' . $extension, $extensions)) { $nonemptylist[] = $fileinfo; } } @@ -178,7 +178,7 @@ abstract class file_info { if ($extensions !== '*') { $filename = $fileinfo->get_visible_name(); $extension = textlib::strtolower(pathinfo($filename, PATHINFO_EXTENSION)); - if (empty($extension) || !in_array('.'.$extension, $extensions)) { + if (empty($extension) || !in_array('.' . $extension, $extensions)) { continue; } } @@ -213,12 +213,12 @@ abstract class file_info { public function get_params_rawencoded() { $params = $this->get_params(); $encoded = array(); - $encoded[] = 'contextid='.$params['contextid']; - $encoded[] = 'component='.$params['component']; - $encoded[] = 'filearea='.$params['filearea']; - $encoded[] = 'itemid='.(is_null($params['itemid']) ? -1 : $params['itemid']); - $encoded[] = 'filepath='.(is_null($params['filepath']) ? '' : rawurlencode($params['filepath'])); - $encoded[] = 'filename='.((is_null($params['filename']) or $params['filename'] === '.') ? '' : rawurlencode($params['filename'])); + $encoded[] = 'contextid=' . $params['contextid']; + $encoded[] = 'component=' . $params['component']; + $encoded[] = 'filearea=' . $params['filearea']; + $encoded[] = 'itemid=' . (is_null($params['itemid']) ? -1 : $params['itemid']); + $encoded[] = 'filepath=' . (is_null($params['filepath']) ? '' : rawurlencode($params['filepath'])); + $encoded[] = 'filename=' . ((is_null($params['filename']) or $params['filename'] === '.') ? '' : rawurlencode($params['filename'])); return $encoded; } diff --git a/lib/filebrowser/file_info_context_course.php b/lib/filebrowser/file_info_context_course.php index c88740a..5e61f56 100644 --- a/lib/filebrowser/file_info_context_course.php +++ b/lib/filebrowser/file_info_context_course.php @@ -376,7 +376,7 @@ class file_info_context_course extends file_info { if ($child = $this->get_file_info($area[0], $area[1], 0, '/', '.')) { if ($returnemptyfolders || $child->count_non_empty_children($extensions)) { $children[] = $child; - if (($countonly !== false) && count($children)>=$countonly) { + if (($countonly !== false) && count($children) >= $countonly) { return $countonly; } } @@ -397,7 +397,7 @@ class file_info_context_course extends file_info { if ($child = $this->browser->get_file_info($modcontext)) { if ($returnemptyfolders || $child->count_non_empty_children($extensions)) { $children[] = $child; - if (($countonly !== false) && count($children)>=$countonly) { + if (($countonly !== false) && count($children) >= $countonly) { return $countonly; } } diff --git a/lib/filebrowser/file_info_context_module.php b/lib/filebrowser/file_info_context_module.php index 5636503..f4b2e52 100644 --- a/lib/filebrowser/file_info_context_module.php +++ b/lib/filebrowser/file_info_context_module.php @@ -280,7 +280,7 @@ class file_info_context_module extends file_info { array('mod_'.$this->modname, 'intro'), array('backup', 'activity') ); - foreach ($this->areas as $area=>$desctiption) { + foreach ($this->areas as $area => $desctiption) { $areas[] = array('mod_'.$this->modname, $area); } diff --git a/mod/workshop/fileinfolib.php b/mod/workshop/fileinfolib.php index 35afd24..0427819 100644 --- a/mod/workshop/fileinfolib.php +++ b/mod/workshop/fileinfolib.php @@ -98,7 +98,7 @@ class workshop_file_info_submissions_container extends file_info { } /** - * Help function to return files matching extensions or their count + * Helper function to return files matching extensions or their count * * @param string|array $extensions, either '*' or array of lowercase extensions, i.e. array('.gif','.jpg') * @param bool|int $countonly if false returns the children, if an int returns just the -- 1.7.9.5 From 16ab3642e777e41dd99588d114b7f9d7174316d3 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Tue, 16 Oct 2012 13:16:41 +0800 Subject: [PATCH 822/903] MDL-35880 user: Adding a heading to profile edit page --- user/edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/user/edit.php b/user/edit.php index aa88131..0ca7509 100644 --- a/user/edit.php +++ b/user/edit.php @@ -293,6 +293,7 @@ $PAGE->set_title("$course->shortname: $streditmyprofile"); $PAGE->set_heading($course->fullname); echo $OUTPUT->header(); +echo $OUTPUT->heading($userfullname); if ($email_changed) { echo $email_changed_html; -- 1.7.9.5 From e191c71d55c7fb624f8f056eb0bb9316df0ffae9 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 16 Oct 2012 16:20:12 +0800 Subject: [PATCH 823/903] MDL-34228 - version.php - bump for new capability --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index e835adf..223594a 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.07; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.08; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -- 1.7.9.5 From 98268916ff989b76c268e11566aae044899d1d20 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 20 Sep 2012 17:18:33 +0800 Subject: [PATCH 824/903] MDL-35171 Forms: Date selector always gets UTF-8 strings --- lib/formslib.php | 38 ++++++++++++++--------------- lib/moodlelib.php | 54 +++++++++++++++++++++++++++++++----------- lib/tests/moodlelib_test.php | 36 ++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 33 deletions(-) diff --git a/lib/formslib.php b/lib/formslib.php index c81dfb7..866ad43 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -81,25 +81,25 @@ function form_init_date_js() { $function = 'M.form.dateselector.init_date_selectors'; $config = array(array( 'firstdayofweek' => get_string('firstdayofweek', 'langconfig'), - 'mon' => strftime('%a', strtotime("Monday")), - 'tue' => strftime('%a', strtotime("Tuesday")), - 'wed' => strftime('%a', strtotime("Wednesday")), - 'thu' => strftime('%a', strtotime("Thursday")), - 'fri' => strftime('%a', strtotime("Friday")), - 'sat' => strftime('%a', strtotime("Saturday")), - 'sun' => strftime('%a', strtotime("Sunday")), - 'january' => strftime('%B', strtotime("January 1")), - 'february' => strftime('%B', strtotime("February 1")), - 'march' => strftime('%B', strtotime("March 1")), - 'april' => strftime('%B', strtotime("April 1")), - 'may' => strftime('%B', strtotime("May 1")), - 'june' => strftime('%B', strtotime("June 1")), - 'july' => strftime('%B', strtotime("July 1")), - 'august' => strftime('%B', strtotime("August 1")), - 'september' => strftime('%B', strtotime("September 1")), - 'october' => strftime('%B', strtotime("October 1")), - 'november' => strftime('%B', strtotime("November 1")), - 'december' => strftime('%B', strtotime("December 1")) + 'mon' => date_format_string(strtotime("Monday"), '%a', 99), + 'tue' => date_format_string(strtotime("Tuesday"), '%a', 99), + 'wed' => date_format_string(strtotime("Wednesday"), '%a', 99), + 'thu' => date_format_string(strtotime("Thursday"), '%a', 99), + 'fri' => date_format_string(strtotime("Friday"), '%a', 99), + 'sat' => date_format_string(strtotime("Saturday"), '%a', 99), + 'sun' => date_format_string(strtotime("Sunday"), '%a', 99), + 'january' => date_format_string(strtotime("January 1"), '%B', 99), + 'february' => date_format_string(strtotime("February 1"), '%B', 99), + 'march' => date_format_string(strtotime("March 1"), '%B', 99), + 'april' => date_format_string(strtotime("April 1"), '%B', 99), + 'may' => date_format_string(strtotime("May 1"), '%B', 99), + 'june' => date_format_string(strtotime("June 1"), '%B', 99), + 'july' => date_format_string(strtotime("July 1"), '%B', 99), + 'august' => date_format_string(strtotime("August 1"), '%B', 99), + 'september' => date_format_string(strtotime("September 1"), '%B', 99), + 'october' => date_format_string(strtotime("October 1"), '%B', 99), + 'november' => date_format_string(strtotime("November 1"), '%B', 99), + 'december' => date_format_string(strtotime("December 1"), '%B', 99) )); $PAGE->requires->yui_module($module, $function, $config); $done = true; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 167a653..41b538f 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -2071,13 +2071,7 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour // (because it's impossible to specify UTF-8 to fetch locale info in Win32) if (abs($timezone) > 13) { /// Server time - if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { - $format = textlib::convert($format, 'utf-8', $localewincharset); - $datestring = strftime($format, $date); - $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); - } else { - $datestring = strftime($format, $date); - } + $datestring = date_format_string($date, $format, $timezone); if ($fixday) { $daystring = ltrim(str_replace(array(' 0', ' '), '', strftime(' %d', $date))); $datestring = str_replace('DD', $daystring, $datestring); @@ -2089,13 +2083,7 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour } else { $date += (int)($timezone * 3600); - if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { - $format = textlib::convert($format, 'utf-8', $localewincharset); - $datestring = gmstrftime($format, $date); - $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); - } else { - $datestring = gmstrftime($format, $date); - } + $datestring = date_format_string($date, $format, $timezone); if ($fixday) { $daystring = ltrim(str_replace(array(' 0', ' '), '', gmstrftime(' %d', $date))); $datestring = str_replace('DD', $daystring, $datestring); @@ -2110,6 +2098,44 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour } /** + * Returns a formatted date ensuring it is UTF-8. + * + * If we are running under Windows convert to Windows encoding and then back to UTF-8 + * (because it's impossible to specify UTF-8 to fetch locale info in Win32). + * + * This function does not do any calculation regarding the user preferences and should + * therefore receive the final date timestamp, format and timezone. Timezone being only used + * to differenciate the use of server time or not (strftime() against gmstrftime()). + * + * @param int $date the timestamp. + * @param string $format strftime format. + * @param int|float $timezone the numerical timezone, typically returned by {@link get_user_timezone_offset()}. + * @return string the formatted date/time. + * @since 2.3.3 + */ +function date_format_string($date, $format, $tz = 99) { + global $CFG; + if (abs($tz) > 13) { + if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { + $format = textlib::convert($format, 'utf-8', $localewincharset); + $datestring = strftime($format, $date); + $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); + } else { + $datestring = strftime($format, $date); + } + } else { + if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { + $format = textlib::convert($format, 'utf-8', $localewincharset); + $datestring = gmstrftime($format, $date); + $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); + } else { + $datestring = gmstrftime($format, $date); + } + } + return $datestring; +} + +/** * Given a $time timestamp in GMT (seconds since epoch), * returns an array that represents the date in user time * diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php index 6beb856..43c2f97 100644 --- a/lib/tests/moodlelib_test.php +++ b/lib/tests/moodlelib_test.php @@ -1993,4 +1993,40 @@ class moodlelib_testcase extends advanced_testcase { ); $this->assertEquals(convert_to_array($obj), $ar); } + + /** + * Test the function date_format_string(). + */ + function test_date_format_string() { + // Forcing locale and timezone. + $oldlocale = setlocale(LC_TIME, '0'); + setlocale(LC_TIME, 'en_AU.UTF-8'); + $systemdefaulttimezone = date_default_timezone_get(); + date_default_timezone_set('Australia/Perth'); + + // Note: date_format_string() uses the timezone only to differenciate + // the server time from the UTC time. It does not modify the timestamp. + // Hence similar results for timezones <= 13. + $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', 99); + $this->assertEquals($str, 'Saturday, 01 January 2011, 06:00 PM'); + + $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', 0); + $this->assertEquals($str, 'Saturday, 01 January 2011, 10:00 AM'); + + $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', -12); + $this->assertEquals($str, 'Saturday, 01 January 2011, 10:00 AM'); + + $str = date_format_string(1293876000, 'Žluťoučký koníček %A', 99); + $this->assertEquals($str, 'Žluťoučký koníček Saturday'); + + $str = date_format_string(1293876000, '言語設定言語 %A', 99); + $this->assertEquals($str, '言語設定言語 Saturday'); + + $str = date_format_string(1293876000, '简体中文简体 %A', 99); + $this->assertEquals($str, '简体中文简体 Saturday'); + + // Restore system default values. + date_default_timezone_set($systemdefaulttimezone); + setlocale(LC_TIME, $oldlocale); + } } -- 1.7.9.5 From 335636f55db85faa54d6854d62d614402a5b5152 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 16 Oct 2012 11:50:25 +0800 Subject: [PATCH 825/903] MDL-35412 core: Moving get_string out of if statement --- lib/moodlelib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 41b538f..1de567f 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -2116,7 +2116,8 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour function date_format_string($date, $format, $tz = 99) { global $CFG; if (abs($tz) > 13) { - if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { + if ($CFG->ostype == 'WINDOWS') { + $localewincharset = get_string('localewincharset', 'langconfig'); $format = textlib::convert($format, 'utf-8', $localewincharset); $datestring = strftime($format, $date); $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); @@ -2124,7 +2125,8 @@ function date_format_string($date, $format, $tz = 99) { $datestring = strftime($format, $date); } } else { - if ($CFG->ostype == 'WINDOWS' and ($localewincharset = get_string('localewincharset', 'langconfig'))) { + if ($CFG->ostype == 'WINDOWS') { + $localewincharset = get_string('localewincharset', 'langconfig'); $format = textlib::convert($format, 'utf-8', $localewincharset); $datestring = gmstrftime($format, $date); $datestring = textlib::convert($datestring, $localewincharset, 'utf-8'); -- 1.7.9.5 From 456352585a8386a67a69e315886ad42fac3c0907 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 16 Oct 2012 17:21:11 +0800 Subject: [PATCH 826/903] MDL-35412 phpunit: date_format_string() is case insensitive --- lib/tests/moodlelib_test.php | 55 +++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php index 43c2f97..09c2fad 100644 --- a/lib/tests/moodlelib_test.php +++ b/lib/tests/moodlelib_test.php @@ -2004,26 +2004,47 @@ class moodlelib_testcase extends advanced_testcase { $systemdefaulttimezone = date_default_timezone_get(); date_default_timezone_set('Australia/Perth'); + $tests = array( + array( + 'tz' => 99, + 'str' => '%A, %d %B %Y, %I:%M %p', + 'expected' => 'Saturday, 01 January 2011, 06:00 PM' + ), + array( + 'tz' => 0, + 'str' => '%A, %d %B %Y, %I:%M %p', + 'expected' => 'Saturday, 01 January 2011, 10:00 AM' + ), + array( + 'tz' => -12, + 'str' => '%A, %d %B %Y, %I:%M %p', + 'expected' => 'Saturday, 01 January 2011, 10:00 AM' + ), + array( + 'tz' => 99, + 'str' => 'Žluťoučký koníček %A', + 'expected' => 'Žluťoučký koníček Saturday' + ), + array( + 'tz' => 99, + 'str' => '言語設定言語 %A', + 'expected' => '言語設定言語 Saturday' + ), + array( + 'tz' => 99, + 'str' => '简体中文简体 %A', + 'expected' => '简体中文简体 Saturday' + ), + ); + // Note: date_format_string() uses the timezone only to differenciate // the server time from the UTC time. It does not modify the timestamp. // Hence similar results for timezones <= 13. - $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', 99); - $this->assertEquals($str, 'Saturday, 01 January 2011, 06:00 PM'); - - $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', 0); - $this->assertEquals($str, 'Saturday, 01 January 2011, 10:00 AM'); - - $str = date_format_string(1293876000, '%A, %d %B %Y, %I:%M %p', -12); - $this->assertEquals($str, 'Saturday, 01 January 2011, 10:00 AM'); - - $str = date_format_string(1293876000, 'Žluťoučký koníček %A', 99); - $this->assertEquals($str, 'Žluťoučký koníček Saturday'); - - $str = date_format_string(1293876000, '言語設定言語 %A', 99); - $this->assertEquals($str, '言語設定言語 Saturday'); - - $str = date_format_string(1293876000, '简体中文简体 %A', 99); - $this->assertEquals($str, '简体中文简体 Saturday'); + // On different systems case of AM PM changes so compare case insensitive. + foreach ($tests as $test) { + $str = date_format_string(1293876000, $test['str'], $test['tz']); + $this->assertEquals(textlib::strtolower($test['expected']), textlib::strtolower($str)); + } // Restore system default values. date_default_timezone_set($systemdefaulttimezone); -- 1.7.9.5 From 9081825ea32de62ca9ef045d8af65a990ff0c0ed Mon Sep 17 00:00:00 2001 From: Jason Platts Date: Tue, 16 Oct 2012 12:09:51 +0100 Subject: [PATCH 827/903] MDL-36075 Forms: Date selector in forms errors in IE7 --- lib/form/yui/dateselector/dateselector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/form/yui/dateselector/dateselector.js b/lib/form/yui/dateselector/dateselector.js index 1109b22..9414db0 100644 --- a/lib/form/yui/dateselector/dateselector.js +++ b/lib/form/yui/dateselector/dateselector.js @@ -220,7 +220,7 @@ YUI.add('moodle-form-dateselector', function(Y) { config.september, config.october, config.november, - config.december ], + config.december ] }); this.calendar.changePageEvent.subscribe(function(){ this.fix_position(); -- 1.7.9.5 From 6ab522802f798f76b64f44f6ebfc9da627d9def6 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 17 Oct 2012 00:34:38 +0000 Subject: [PATCH 828/903] Automatically generated installer lang files --- install/lang/ms/admin.php | 42 +++++++++++++++++++++ install/lang/ms/install.php | 83 ++++++++++++++++++++++++++++++++++++++++++ install/lang/ms/moodle.php | 35 ++++++++++++++++++ install/lang/zh_tw/admin.php | 9 +++++ 4 files changed, 169 insertions(+) create mode 100644 install/lang/ms/admin.php create mode 100644 install/lang/ms/install.php create mode 100644 install/lang/ms/moodle.php diff --git a/install/lang/ms/admin.php b/install/lang/ms/admin.php new file mode 100644 index 0000000..3673ceb --- /dev/null +++ b/install/lang/ms/admin.php @@ -0,0 +1,42 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['clianswerno'] = 't'; +$string['cliansweryes'] = 'y'; +$string['cliincorrectvalueerror'] = 'Ralat, nilai tidak betul "{$a->value}" untuk "{$a->option}"'; +$string['cliincorrectvalueretry'] = 'Nilai yang salah, sila cuba lagi'; +$string['clitypevalue'] = 'taip nilai'; +$string['clitypevaluedefault'] = 'taip nilai, tekan Enter untuk gunakan nilai lalai ({$a})'; +$string['cliunknowoption'] = 'Pilihan yang tidak diketahui: + {$a} +Sila gunakan pilihan --help'; +$string['cliyesnoprompt'] = 'tapi y (ya) atau t (tidak)'; diff --git a/install/lang/ms/install.php b/install/lang/ms/install.php new file mode 100644 index 0000000..a9240fc2 --- /dev/null +++ b/install/lang/ms/install.php @@ -0,0 +1,83 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['admindirname'] = 'Direktori admin'; +$string['availablelangs'] = 'Senarai bahasa yang tersedia'; +$string['chooselanguagehead'] = 'Pilih bahasa'; +$string['chooselanguagesub'] = 'Sila pilih bahasa untuk pemasangan. Bahasa ini juga akan digunakan sebagai bahasa lalai untuk laman, ia boleh diubah kemudian.'; +$string['clialreadyinstalled'] = 'config.php fail sudah wujud, sila gunakan admin/cli/upgrade.php jika anda mahu menaik taraf laman web anda.'; +$string['cliinstallheader'] = 'Baris arahan pemasangan program Moodle {$a}'; +$string['databasehost'] = 'Hos pangkalan data'; +$string['databasename'] = 'Nama pangkalan data'; +$string['databasetypehead'] = 'Pilih pemacu pangkalan data'; +$string['dataroot'] = 'Direktori data'; +$string['dbprefix'] = 'Awalan jadual'; +$string['dirroot'] = 'Direktori Moodle'; +$string['environmenthead'] = 'Memeriksa persekitaran anda ...'; +$string['environmentsub2'] = 'Setiap pelepasan Moodle mempunyai keperluan minimum versi PHP dan beberapa sambungan mandatori PHP. Persekitaran penuh disemak sebelum setiap pemasangan dan naik taraf. Sila hubungi pentadbir pelayan jika anda tidak tahu bagaimana untuk memasang versi baru atau membolehkan sambungan PHP.'; +$string['errorsinenvironment'] = 'Semakan persekitaran gagal!'; +$string['installation'] = 'Pemasangan'; +$string['langdownloaderror'] = 'Malangnya bahasa "{$a}" tidak boleh dimuat turun. Proses pemasangan akan diteruskan dalam bahasa Bahasa Inggeris.'; +$string['memorylimithelp'] = '

      Had memori PHP untuk pelayan anda ditetapkan kepada {$a}.

      + +

      Hal ini akan menyebabkan Moodle untuk mendapat masalah memori di kemudian hari, terutama jika anda mempunyai banyak modul yang diaktifkan dan/atau ramai pengguna.

      + +

      Kami menyarankan anda mengkonfigurasikan PHP dengan had yang lebih tinggi jika memungkinkan, seperti 40M. Ada beberapa cara untuk melakukan hal ini yang anda boleh cuba:

      +
        +
      1. Jika anda mampu, kompil semula PHP dengan --enable-memory-limit. Hal ini akan membolehkan Moodle untuk menetapkan batas memori itu sendiri.
        2. +
      2. Jika anda mempunyai akses ke fail php.ini, anda boleh menukar setting memory_limit di sana untuk sesuatu seperti 40M. Jika anda tidak mempunyai akses anda mungkin boleh meminta pentadbir anda untuk melakukan ini untuk anda.
        3. +
      3. Pada beberapa server PHP anda boleh mencipta baris fail .htaccess di direktori Moodle mengandungi ini:
        php_value memory_limit 40M

        Namun, pada beberapa server ini akan mencegah semua laman PHP dari berjalan (anda akan melihat ralat ketika anda melihat halaman), sehingga anda hapuskan file .htaccess.

      '; +$string['paths'] = 'Laluan'; +$string['pathserrcreatedataroot'] = 'Direktori data ({$a->dataroot}) tidak boleh diwujudkan oleh pemasang.'; +$string['pathshead'] = 'Sahkan laluan'; +$string['pathsrodataroot'] = 'Direktori dataroot tidak dapat ditulis.'; +$string['pathsroparentdataroot'] = 'Direktori induk ({$a->parent}) tidak boleh tulis. Direktori data ({$a->dataroot}) tidak boleh diwujudkan oleh pemasang.'; +$string['pathssubadmindir'] = 'Beberapa webhos menggunakan /admin sebagai URL khas untuk anda akses panel kawalan atau sesuatu yang lain. Malangnya, ini bertentangan dengan lokasi standard untuk halaman pentadbiran Moodle. Anda boleh memperbaiki ini dengan menamakan semula direktori admin dalam pemasangan anda, dan meletakkan nama baru di sini. Sebagai contoh:

      moodleadmin

      +Ini akan memulihkan pautan admin dalam Moodle.'; +$string['pathssubdataroot'] = 'Anda perlukan lokasi di mana Moodle boleh menyimpan fail yang dimuat naik. Direktori ini sepatutnya boleh dibaca DAN BOLEH DITULIS oleh pengguna web server (biasanya \'nobody\' atau \'apache\'), tetapi ia mestilah tidak boleh diakses secara langsung melalui laman web. Pemasang akan cuba untuk mewujudkannya jika belum ada.'; +$string['pathssubdirroot'] = 'Direktori laluan penuh untuk pemasangan Moodle.'; +$string['pathssubwwwroot'] = 'Alamat penuh web di mana Moodle akan dicapai. Adalah tidak mungkin untuk mengakses Moodle menggunakan pelbagai alamat. Jika laman anda mempunyai beberapa alamat awam, anda mesti menubuhkan pelencongan kekal kepada semua mereka kecuali yang satu ini. Jika laman web anda boleh diakses kedua-duanya dari Intranet dan Internet menggunakan alamat awam di sini dan menubuhkan DNS supaya pengguna Intranet boleh menggunakan alamat awam juga. Jika alamat itu tidak betul, sila ubah URL di pelayar anda untuk memulakan semula pemasangan dengan nilai yang berbeza.'; +$string['pathsunsecuredataroot'] = 'Lokasi dataroot tidak selamat'; +$string['pathswrongadmindir'] = 'Direktori admin tidak wujud'; +$string['phpextension'] = 'Sambungan PHP {$a}'; +$string['phpversion'] = 'Versi PHP'; +$string['phpversionhelp'] = '

      Moodle memerlukan versi PHP minimal 4.3.0 atau 5.1.0 (5.0.x memiliki sejumlah masalah yang diketahui).

      +

      Anda sedang menjalankan versi {$a}

      +

      Anda harus upgrade PHP atau berpindah ke host dengan versi terbaru PHP!
      (Dalam kes 5.0.x Anda juga boleh turun taraf ke versi 4.4.x)

      '; +$string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; +$string['welcomep20'] = 'Anda melihat halaman ini kerana anda telah berjaya memasang dan melancarkan pakej {$a->packname} {$a->packversion} di komputer anda. Tahniah!'; +$string['welcomep30'] = 'Keluaran ini {$a->installername} termasuk aplikasi untuk mencipta sebuah persekitaran di mana Moodle akan beroperasi, iaitu:'; +$string['welcomep40'] = 'Pakej ini juga termasuk Moodle {$a->moodlerelease} ({$a->moodleversion}).'; +$string['welcomep50'] = 'Penggunaan semua aplikasi di dalam pakej ini dikawal oleh lesen masing-masing. Pakej lengkap {$a->installername} adalah sumber terbuka dan diedarkan di bawah lesen GPL.'; +$string['welcomep60'] = 'Laman-laman berikut akan membawa anda melalui beberapa langkah-langkah mudah diikuti untuk mengkonfigurasi dan menetapkan Moodle pada komputer anda. Anda mungkin menerima tetapan lalai atau, dengan pilihan, meminda untuk disesuaikan dengan keperluan anda.'; +$string['welcomep70'] = 'Klik butang "Seterusnya" di bawah untuk meneruskan penubuhan Moodle.'; +$string['wwwroot'] = 'Alamat Web'; diff --git a/install/lang/ms/moodle.php b/install/lang/ms/moodle.php new file mode 100644 index 0000000..145ec13 --- /dev/null +++ b/install/lang/ms/moodle.php @@ -0,0 +1,35 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['language'] = 'Bahasa'; +$string['next'] = 'Seterusnya'; +$string['previous'] = 'Sebelum'; diff --git a/install/lang/zh_tw/admin.php b/install/lang/zh_tw/admin.php index ef41512..5eb6cc3 100644 --- a/install/lang/zh_tw/admin.php +++ b/install/lang/zh_tw/admin.php @@ -30,5 +30,14 @@ defined('MOODLE_INTERNAL') || die(); +$string['clianswerno'] = 'n'; +$string['cliansweryes'] = 'y'; +$string['cliincorrectvalueerror'] = '錯誤，不正確的值 "{$a->value}" 用於 "{$a->option}"'; +$string['cliincorrectvalueretry'] = '不正確的值，請再試一次'; +$string['clitypevalue'] = '打入一值'; +$string['clitypevaluedefault'] = '打入一值，按Enter可使用預設值({$a})'; +$string['cliunknowoption'] = '不認得的選項： {$a} +請使用 --幫助 選項。'; +$string['cliyesnoprompt'] = '輸入y(是) 或n(否)'; $string['environmentrequireinstall'] = '必須安裝/啟用'; $string['environmentrequireversion'] = '要求版本為 {$a->needed} ，您目前版本為 {$a->current}'; -- 1.7.9.5 From db05d5953493cf9b1a3bff717acdd65a237c9397 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 17 Oct 2012 13:54:45 +0800 Subject: [PATCH 829/903] MDL-36076 qtype multichoice: validation fails on '0' answer. --- .../type/multichoice/edit_multichoice_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php index e94c202..031605e 100644 --- a/question/type/multichoice/edit_multichoice_form.php +++ b/question/type/multichoice/edit_multichoice_form.php @@ -110,10 +110,10 @@ class qtype_multichoice_edit_form extends question_edit_form { //check no of choices $trimmedanswer = trim($answer['text']); $fraction = (float) $data['fraction'][$key]; - if (empty($trimmedanswer) && empty($fraction)) { + if ($trimmedanswer === '' && empty($fraction)) { continue; } - if (empty($trimmedanswer)) { + if ($trimmedanswer === '') { $errors['fraction['.$key.']'] = get_string('errgradesetanswerblank', 'qtype_multichoice'); } -- 1.7.9.5 From dd5e3ac22261c7a14c0fb64f44cce2f2e1ba631d Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 18 Oct 2012 00:34:55 +0000 Subject: [PATCH 830/903] Automatically generated installer lang files --- install/lang/it/langconfig.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/lang/it/langconfig.php b/install/lang/it/langconfig.php index 1b8da44..4e2760f 100644 --- a/install/lang/it/langconfig.php +++ b/install/lang/it/langconfig.php @@ -30,5 +30,6 @@ defined('MOODLE_INTERNAL') || die(); +$string['parentlanguage'] = ''; $string['thisdirection'] = 'ltr'; $string['thislanguage'] = 'Italiano'; -- 1.7.9.5 From c034e59beef142d2e21b19e7f85c48a742184214 Mon Sep 17 00:00:00 2001 From: David Tang Date: Wed, 17 Oct 2012 12:51:25 +0100 Subject: [PATCH 831/903] MDL-31629 auth_shibboleth Use correct language string location --- auth/shibboleth/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php index a1e4a1c..95639a4 100644 --- a/auth/shibboleth/index.php +++ b/auth/shibboleth/index.php @@ -25,7 +25,7 @@ // Check whether Shibboleth is configured properly if (empty($pluginconfig->user_attribute)) { - print_error('shib_not_set_up_error', 'auth'); + print_error('shib_not_set_up_error', 'auth_shibboleth'); } /// If we can find the Shibboleth attribute, save it in session and return to main login page @@ -91,9 +91,9 @@ // If we can find any (user independent) Shibboleth attributes but no user // attributes we probably didn't receive any user attributes elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID']) || !empty($_SERVER['Shib-Application-ID'])) { - print_error('shib_no_attributes_error', 'auth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''); + print_error('shib_no_attributes_error', 'auth_shibboleth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''); } else { - print_error('shib_not_set_up_error', 'auth'); + print_error('shib_not_set_up_error', 'auth_shibboleth'); } -- 1.7.9.5 From 4e15f69cb1a0e0b438083bc379135d11005631d7 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Thu, 18 Oct 2012 14:13:18 +0800 Subject: [PATCH 832/903] MDL-35489 users: Check added before using form data --- user/filters/text.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/user/filters/text.php b/user/filters/text.php index 2f54d4e..8be8f1f 100644 --- a/user/filters/text.php +++ b/user/filters/text.php @@ -62,7 +62,12 @@ class user_filter_text extends user_filter_type { // no data - no change except for empty filter return false; } - return array('operator'=>(int)$formdata->$operator, 'value'=>$formdata->$field); + // If field value is set then use it, else it's null. + $fieldvalue = null; + if (isset($formdata->$field)) { + $fieldvalue = $formdata->$field; + } + return array('operator' => (int)$formdata->$operator, 'value' => $fieldvalue); } return false; -- 1.7.9.5 From b1c5155cbcd1885096a7a8a5cc35405a86c0a815 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Thu, 18 Oct 2012 19:43:28 +0800 Subject: [PATCH 833/903] weekly release 2.3.3+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 223594a..b25cd6c 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.08; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.09; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20121014)'; // Human-friendly version name +$release = '2.3.3+ (Build: 20121018)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From e2694e9dd6089856a14b62ddebc1a0de5b06783d Mon Sep 17 00:00:00 2001 From: Gilles-Philippe Leblanc Date: Thu, 18 Oct 2012 08:51:51 -0400 Subject: [PATCH 834/903] MDL-31708 wiki: Wiki 2.0 non-group member can see edit option in navigation block --- mod/wiki/lang/en/wiki.php | 2 ++ mod/wiki/lib.php | 2 +- mod/wiki/locallib.php | 2 +- mod/wiki/pagelib.php | 11 ++--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mod/wiki/lang/en/wiki.php b/mod/wiki/lang/en/wiki.php index 80fbdf4..d332563 100644 --- a/mod/wiki/lang/en/wiki.php +++ b/mod/wiki/lang/en/wiki.php @@ -22,8 +22,10 @@ $string['backoldversion'] = 'Back to old version'; $string['backpage'] = 'Back to page'; $string['backtomapmenu'] = 'Back to map menu'; $string['changerate'] = 'Do you wish to change it?'; +$string['cannoteditpage'] = 'You can not edit this page.'; $string['cannotmanagefiles'] = 'You don\'t have permission to manage the wiki files.'; $string['cannotviewfiles'] = 'You don\'t have permission to view the wiki files.'; +$string['cannotviewpage'] = 'You can not view this page.'; $string['comparesel'] = 'Compare selected'; $string['comments'] = 'Comments'; $string['commentscount'] = 'Comments ({$a})'; diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php index 133178a..974c46d 100644 --- a/mod/wiki/lib.php +++ b/mod/wiki/lib.php @@ -531,7 +531,7 @@ function wiki_extend_navigation(navigation_node $navref, $course, $module, $cm) $node = $navref->add(get_string('view', 'wiki'), $link, navigation_node::TYPE_SETTING); } - if (has_capability('mod/wiki:editpage', $context)) { + if (wiki_user_can_edit($subwiki)) { $link = new moodle_url('/mod/wiki/edit.php', array('pageid' => $pageid)); $node = $navref->add(get_string('edit', 'wiki'), $link, navigation_node::TYPE_SETTING); } diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php index ff3b67a..079ce2a 100644 --- a/mod/wiki/locallib.php +++ b/mod/wiki/locallib.php @@ -767,7 +767,7 @@ function wiki_user_can_view($subwiki) { // Each person owns a wiki. if ($wiki->wikimode == 'collaborative' || $wiki->wikimode == 'individual') { // Only members of subwiki group could view that wiki - if ($subwiki->groupid == groups_get_activity_group($cm)) { + if (groups_is_member($subwiki->groupid)) { // Only view capability needed return has_capability('mod/wiki:viewpage', $context); diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php index 4fe9d50..511f48f 100644 --- a/mod/wiki/pagelib.php +++ b/mod/wiki/pagelib.php @@ -172,13 +172,8 @@ abstract class page_wiki { if (!$manage and !($edit and groups_is_member($currentgroup))) { unset($this->tabs['edit']); } - } else { - if (!has_capability('mod/wiki:editpage', $PAGE->context)) { - unset($this->tabs['edit']); - } } - if (empty($options)) { $this->tabs_options = array('activetab' => substr(get_class($this), 10)); } else { @@ -326,8 +321,7 @@ class page_wiki_view extends page_wiki { } } } else { - // @TODO: Tranlate it - echo "You can not view this page"; + echo get_string('cannotviewpage', 'wiki'); } } @@ -420,8 +414,7 @@ class page_wiki_edit extends page_wiki { if (wiki_user_can_edit($this->subwiki)) { $this->print_edit(); } else { - // @TODO: Translate it - echo "You can not edit this page"; + echo get_string('cannoteditpage', 'wiki'); } } -- 1.7.9.5 From c8ee9dde6089de247cd5c005d5fe2d67f8435513 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Thu, 18 Oct 2012 13:38:18 +0100 Subject: [PATCH 835/903] MDL-35510 theme_mymobile: RTL fixes for course and category names in style/jmobile11_rtl.css --- theme/mymobile/style/jmobile11_rtl.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/theme/mymobile/style/jmobile11_rtl.css b/theme/mymobile/style/jmobile11_rtl.css index 7d2ba26..30466f5 100644 --- a/theme/mymobile/style/jmobile11_rtl.css +++ b/theme/mymobile/style/jmobile11_rtl.css @@ -41,8 +41,6 @@ padding-right: 7px; } -.dir-rtl .ui-li-count { left:38px; right:auto;} - .dir-rtl .ui-checkbox .ui-btn, .dir-rtl .ui-radio .ui-btn { text-align: right; } @@ -51,4 +49,14 @@ .path-mod-quiz.dir-rtl .que .control { width: 75%; +} + +.dir-rtl .categorybox .ui-btn-inner, +.dir-rtl .coursebox .ui-btn-inner { + text-align: right; + } + +.dir-rtl .categorybox .ui-btn-text, +.dir-rtl .coursebox .ui-btn-text { + padding-right: 25px; } \ No newline at end of file -- 1.7.9.5 From 09725180cff2633cf8ad678ec1209257656d70c9 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Fri, 19 Oct 2012 00:35:15 +0000 Subject: [PATCH 836/903] Automatically generated installer lang files --- install/lang/zh_tw/install.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/install/lang/zh_tw/install.php b/install/lang/zh_tw/install.php index 07cb23e..c63fa29 100644 --- a/install/lang/zh_tw/install.php +++ b/install/lang/zh_tw/install.php @@ -34,10 +34,18 @@ $string['admindirname'] = '管理目錄'; $string['availablelangs'] = '可使用的語言包'; $string['chooselanguagehead'] = '選擇一種語言'; $string['chooselanguagesub'] = '請選擇在安裝過程中使用的語言。稍後您可以根據需要重新選擇用於網站和使用者的語言。'; +$string['clialreadyconfigured'] = '檔案 config.php 已經存在，若你要安裝這一網站，請使用dmin/cli/install_database.php'; +$string['clialreadyinstalled'] = '檔案 config.php 已經存在，若你要升級這一網站，請使用admin/cli/upgrade.php'; +$string['cliinstallheader'] = 'Moodle {$a} 指令行安裝程式'; +$string['databasehost'] = '資料庫主機'; +$string['databasename'] = '資料庫名稱'; +$string['databasetypehead'] = '選擇資料庫磁碟機'; $string['dataroot'] = '資料目錄'; +$string['datarootpermission'] = '資料目錄存取授權'; $string['dbprefix'] = '資料表名稱的前置字元'; $string['dirroot'] = 'Moodle目錄'; $string['environmenthead'] = '檢查您的環境中...'; +$string['errorsinenvironment'] = '環境檢查失敗'; $string['installation'] = '安裝'; $string['langdownloaderror'] = '很不幸地，語言“{$a}”並未安裝。安裝過程將以英文繼續。'; $string['memorylimithelp'] = '

      PHP記憶體上限目前設定為{$a}。

      @@ -50,6 +58,14 @@ $string['memorylimithelp'] = '

      PHP記憶體上限目前設定為{$a}。

    • 在一些PHP伺服器上，您可以在Moodle目錄下，建立.htaccess檔，包含這行:

      php_value memory_limit 16M

      然而，在一些伺服器上，這將造成所有的 PHP 網頁無法運作(當您看這些網頁時，您就會看到錯誤) 因此，您就必須將 .htaccess 檔案移除。 '; +$string['paths'] = '路徑'; +$string['pathserrcreatedataroot'] = '資料目錄 ({$a->dataroot})無法由這安裝程式建立'; +$string['pathshead'] = '確認路徑'; +$string['pathsrodataroot'] = '資料根目錄是無法寫入的'; +$string['pathssubdirroot'] = 'Moodle安裝的完整目錄徑路'; +$string['pathsunsecuredataroot'] = '資料根(Dataroot)目錄的位置不安全'; +$string['pathswrongadmindir'] = '管理目錄不存在'; +$string['phpextension'] = '{$a} PHP擴展'; $string['phpversion'] = 'PHP版本'; $string['phpversionhelp'] = '

      Moodle 需要至少4.1.0.的PHP版本

      您目前執行的是{$a} 版

      -- 1.7.9.5 From d2d17341e8eff08767cc7dd4e830d0855433487a Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Fri, 19 Oct 2012 13:21:03 +0800 Subject: [PATCH 837/903] MDL-21625 Question bank: Add accessibility to table layout for viewing question list --- mod/quiz/editlib.php | 9 ++++++++ question/editlib.php | 58 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 6d16aa7..f64e282 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -1138,6 +1138,15 @@ class quiz_question_bank_view extends question_bank_view { 'editaction', 'previewaction'); } + /** + * Specify the column heading + * + * @return string Column name for the heading + */ + protected function heading_column() { + return 'questionnametext'; + } + protected function default_sort() { $this->requiredcolumns['qtype'] = $this->knowncolumntypes['qtype']; $this->requiredcolumns['questionnametext'] = $this->knowncolumntypes['questionnametext']; diff --git a/question/editlib.php b/question/editlib.php index e688add..e4f811e 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -134,6 +134,9 @@ abstract class question_bank_column_base { */ protected $qbank; + /** @var bool determine whether the column is td or th. */ + protected $isheading = false; + /** * Constructor. * @param $qbank the question_bank_view we are helping to render. @@ -150,6 +153,13 @@ abstract class question_bank_column_base { protected function init() { } + /** + * Set the column as heading + */ + public function set_as_heading() { + $this->isheading = true; + } + public function is_extra_row() { return false; } @@ -258,8 +268,20 @@ abstract class question_bank_column_base { $this->display_end($question, $rowclasses); } + /** + * Output the opening column tag. If it is set as heading, it will use tag instead of + * + * @param stdClass $question + * @param array $rowclasses + */ protected function display_start($question, $rowclasses) { - echo ''; + $tag = 'td'; + $attr = array('class' => $this->get_classes()); + if ($this->isheading) { + $tag = 'th'; + $attr['scope'] = 'row'; + } + echo html_writer::start_tag($tag, $attr); } /** @@ -292,8 +314,18 @@ abstract class question_bank_column_base { */ protected abstract function display_content($question, $rowclasses); + /** + * Output the closing column tag + * + * @param type $question + * @param type $rowclasses + */ protected function display_end($question, $rowclasses) { - echo "\n"; + $tag = 'td'; + if ($this->isheading) { + $tag = 'th'; + } + echo html_writer::end_tag($tag); } /** @@ -885,7 +917,7 @@ class question_bank_view { $this->lastchangedid = optional_param('lastchanged',0,PARAM_INT); $this->init_column_types(); - $this->init_columns($this->wanted_columns()); + $this->init_columns($this->wanted_columns(), $this->heading_column()); $this->init_sort(); $PAGE->requires->yui2_lib('container'); @@ -901,6 +933,15 @@ class question_bank_view { return $columns; } + /** + * Specify the column heading + * + * @return string Column name for the heading + */ + protected function heading_column() { + return 'questionname'; + } + protected function known_field_types() { return array( new question_bank_checkbox_column($this), @@ -923,7 +964,13 @@ class question_bank_view { } } - protected function init_columns($wanted) { + /** + * Initializing table columns + * + * @param array $wanted Collection of column names + * @param string $heading The name of column that is set as heading + */ + protected function init_columns($wanted, $heading = '') { $this->visiblecolumns = array(); $this->extrarows = array(); foreach ($wanted as $colname) { @@ -938,6 +985,9 @@ class question_bank_view { } } $this->requiredcolumns = array_merge($this->visiblecolumns, $this->extrarows); + if (array_key_exists($heading, $this->requiredcolumns)) { + $this->requiredcolumns[$heading]->set_as_heading(); + } } /** -- 1.7.9.5 From 3a15a7519c5aa4d7d65252de87267c3c21a76c6f Mon Sep 17 00:00:00 2001 From: Aaron Barnes Date: Fri, 19 Oct 2012 00:13:40 +1300 Subject: [PATCH 838/903] MDL-36107 scorm: Fix non-static method call --- mod/scorm/lib.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index 27b4722..c3de373 100644 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -1328,22 +1328,25 @@ function scorm_dndupload_handle($uploadinfo) { * @param array $grades grades array of users with grades - used when $userid = 0 */ function scorm_set_completion($scorm, $userid, $completionstate = COMPLETION_COMPLETE, $grades = array()) { - if (!completion_info::is_enabled()) { - return; - } - $course = new stdClass(); $course->id = $scorm->course; + $completion = new completion_info($course); + + // Check if completion is enabled site-wide, or for the course + if (!$completion->is_enabled()) { + return; + } $cm = get_coursemodule_from_instance('scorm', $scorm->id, $scorm->course); - if (!empty($cm)) { - $completion = new completion_info($course); - if (empty($userid)) { //we need to get all the relevant users from $grades param. - foreach ($grades as $grade) { - $completion->update_state($cm, $completionstate, $grade->userid); - } - } else { - $completion->update_state($cm, $completionstate, $userid); + if (empty($cm) || !$completion->is_enabled($cm)) { + return; + } + + if (empty($userid)) { //we need to get all the relevant users from $grades param. + foreach ($grades as $grade) { + $completion->update_state($cm, $completionstate, $grade->userid); } + } else { + $completion->update_state($cm, $completionstate, $userid); } } -- 1.7.9.5 From 75441ef5b2a33518c9fd2aeece79db2f62aebd35 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Fri, 19 Oct 2012 15:46:09 +0800 Subject: [PATCH 839/903] MDL-21625 Question bank: fixing whitespace --- mod/quiz/editlib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index f64e282..d02f57b 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -1138,7 +1138,7 @@ class quiz_question_bank_view extends question_bank_view { 'editaction', 'previewaction'); } - /** + /** * Specify the column heading * * @return string Column name for the heading -- 1.7.9.5 From ea67a0679dd2016dcffc29c0ebe1bf3e73940cae Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 19 Oct 2012 16:07:05 +0800 Subject: [PATCH 840/903] MDL-35910 Assignment 2.2: Fixed included files in assignment zip. If Marking button is enabled, assignment is open and is not finalized, then don't add file to zip --- mod/assignment/type/upload/assignment.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 91c5f5f..8ca17bd 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -1164,9 +1164,9 @@ class assignment_upload extends assignment_base { } $filename = str_replace(' ', '_', clean_filename($this->course->shortname.'-'.$this->assignment->name.'-'.$groupname.$this->assignment->id.".zip")); //name of new zip file. foreach ($submissions as $submission) { - // If assignment is open and submission is not finalized then don't add it to zip. + // If assignment is open and submission is not finalized and marking button enabled then don't add it to zip. $submissionstatus = $this->is_finalized($submission); - if ($this->isopen() && empty($submissionstatus)) { + if ($this->isopen() && empty($submissionstatus) && !empty($this->assignment->var4)) { continue; } $a_userid = $submission->userid; //get userid -- 1.7.9.5 From 44da3c50fee04559a064b785d74baede356ce277 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Tue, 16 Oct 2012 10:44:34 +0200 Subject: [PATCH 841/903] MDL-36070 - Points label hides UP and Down ordering arrows and Delete Icon on Quiz edit page, in RTL mode (theme/standard) --- mod/quiz/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 322ccdd..23e019d 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -401,7 +401,7 @@ bank window's title is prominent enough*/ #page-mod-quiz-edit.dir-rtl div.question {clear: right;} #page-mod-quiz-edit.dir-rtl div.question div.qnum {float: right;} #page-mod-quiz-edit.dir-rtl div.editq div.question div.content {float: right;height: 40px;} -#page-mod-quiz-edit.dir-rtl div.question div.content div.points {left: 5px;right:auto;} +#page-mod-quiz-edit.dir-rtl div.question div.content div.points {left: 50px;right:auto;} #page-mod-quiz-edit.dir-rtl div.question div.content div.questioncontrols {float: left;left: 0.3em; right:auto;} #page-mod-quiz-edit.dir-rtl .editq div.question div.content .singlequestion .questioneditbutton .questionname, #page-mod-quiz-edit.dir-rtl .editq div.question div.content .singlequestion .questioneditbutton .questiontext {float: right; padding-right: 0.3em;} @@ -414,4 +414,4 @@ bank window's title is prominent enough*/ #page-mod-quiz-edit.dir-rtl .quizpagedelete {left: 0.2em;right:auto;} #page-mod-quiz-edit.dir-rtl div.quizcontents {clear: right;float: right;} #page-mod-quiz-edit.dir-rtl .questionbankwindow.block {float: left;} -#page-question-edit.dir-rtl td.creatorname, #page-question-edit.dir-rtl td.modifiername {text-align: center;} \ No newline at end of file +#page-question-edit.dir-rtl td.creatorname, #page-question-edit.dir-rtl td.modifiername {text-align: center;} -- 1.7.9.5 From 00c7657edf4dee69b62aaf9846f6ae0532ad8f73 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sun, 14 Oct 2012 13:49:07 +0200 Subject: [PATCH 842/903] MDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when in RTL mode --- mod/quiz/styles.css | 4 +++- question/type/calculated/styles.css | 14 ++++++++++++++ question/type/numerical/styles.css | 12 ++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 322ccdd..f3fbb42 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -414,4 +414,6 @@ bank window's title is prominent enough*/ #page-mod-quiz-edit.dir-rtl .quizpagedelete {left: 0.2em;right:auto;} #page-mod-quiz-edit.dir-rtl div.quizcontents {clear: right;float: right;} #page-mod-quiz-edit.dir-rtl .questionbankwindow.block {float: left;} -#page-question-edit.dir-rtl td.creatorname, #page-question-edit.dir-rtl td.modifiername {text-align: center;} \ No newline at end of file +#page-question-edit.dir-rtl td.creatorname, #page-question-edit.dir-rtl td.modifiername {text-align: center;} +.path-question-type.dir-rtl input[name="defaultmark"], +#page-mod-quiz-edit.dir-rtl div.points input {direction: ltr;text-align: left;} diff --git a/question/type/calculated/styles.css b/question/type/calculated/styles.css index 132b629..d8f5dbf 100644 --- a/question/type/calculated/styles.css +++ b/question/type/calculated/styles.css @@ -6,3 +6,17 @@ .que.calculated .answer input[type="text"] { width: 30%; } + +/* Numeric INPUT text boxes should be left aligned in RTL mode +*/ +#page-question-type-calculated.dir-rtl input[name^="answer"], +#page-question-type-calculated.dir-rtl input[name^="unit"], +#page-question-type-calculated.dir-rtl input[name^="multiplier"], +#page-question-type-calculated.dir-rtl input[name^="calcmax"], +#page-question-type-calculated.dir-rtl input[name^="calcmin"], +#page-question-type-calculated.dir-rtl input[name^="number"], +#page-question-type-calculated.dir-rtl input[name^="tolerance"] +{ + direction: ltr; + text-align: left; +} diff --git a/question/type/numerical/styles.css b/question/type/numerical/styles.css index 784c855..50958df 100644 --- a/question/type/numerical/styles.css +++ b/question/type/numerical/styles.css @@ -6,3 +6,15 @@ .que.numerical .answer input[type="text"] { width: 30%; } + +/* Numeric INPUT text boxes should be left aligned in RTL mode +*/ +#page-question-type-numerical.dir-rtl input[name="unitpenalty"], +#page-question-type-numerical.dir-rtl input[name^="answer"], +#page-question-type-numerical.dir-rtl input[name^="tolerance"], +#page-question-type-numerical.dir-rtl input[name^="multiplier"], +#page-question-type-numerical.dir-rtl input[name^="unit"] +{ + direction: ltr; + text-align: left; +} -- 1.7.9.5 From 28788427423d18d41294d956ca72161ed94679a2 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Fri, 19 Oct 2012 16:49:34 +0800 Subject: [PATCH 843/903] MDL-36103 tablelib: links to user profiles are wrong in courses. --- lib/tablelib.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/tablelib.php b/lib/tablelib.php index 6de22af..2a08616 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -727,16 +727,19 @@ class flexible_table { function col_fullname($row) { global $COURSE, $CFG; - if (!$this->download) { - $profileurl = new moodle_url('/user/profile.php', array('id' => $row->{$this->useridfield})); - if ($COURSE->id != SITEID) { - $profileurl->param('course', $COURSE->id); - } - return html_writer::link($profileurl, fullname($row)); + $name = fullname($row); + if ($this->download) { + return $name; + } + $userid = $row->{$this->useridfield}; + if ($COURSE->id == SITEID) { + $profileurl = new moodle_url('/user/profile.php', array('id' => $userid)); } else { - return fullname($row); + $profileurl = new moodle_url('/user/view.php', + array('id' => $userid, 'course' => $COURSE->id)); } + return html_writer::link($profileurl, $name); } /** -- 1.7.9.5 From 86483349663d735a85d09c072ab5197000b45ddb Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 19 Oct 2012 11:58:25 +0800 Subject: [PATCH 844/903] MDL-36131 AJAX: Conditional activities will behave same as in non-ajax mode --- course/lib.php | 12 ++++++++---- course/yui/toolboxes/toolboxes.js | 27 ++++++++++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/course/lib.php b/course/lib.php index ef150d0..fcbd1b6 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1548,8 +1548,8 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, $linkclasses = ''; $textclasses = ''; if ($accessiblebutdim) { - $linkclasses .= ' dimmed'; - $textclasses .= ' dimmed_text'; + $linkclasses .= ' dimmed conditionalhidden'; + $textclasses .= ' dimmed_text conditionalhidden'; $accesstext = ''. get_string('hiddenfromstudents').': '; } else { @@ -1731,11 +1731,15 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // see the activity itself, or for staff) if (!$mod->uservisible) { echo '
      '.$mod->availableinfo.'
      '; - } else if ($canviewhidden && !empty($CFG->enableavailability) && $mod->visible) { + } else if ($canviewhidden && !empty($CFG->enableavailability)) { + $visibilityclass = ''; + if (!$mod->visible) { + $visibilityclass = 'accesshide'; + } $ci = new condition_info($mod); $fullinfo = $ci->get_full_information(); if($fullinfo) { - echo '
      '.get_string($mod->showavailability + echo '
      '.get_string($mod->showavailability ? 'userrestriction_visible' : 'userrestriction_hidden','condition', $fullinfo).'
      '; diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index 0f70c2c..db7dae8 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -33,7 +33,11 @@ YUI.add('moodle-course-toolboxes', function(Y) { SECTIONIDPREFIX : 'section-', SECTIONLI : 'li.section', SHOW : 'a.editing_show', - SHOWHIDE : 'a.editing_showhide' + SHOWHIDE : 'a.editing_showhide', + CONDITIONALHIDDEN : 'conditionalhidden', + AVAILABILITYINFODIV : 'div.availabilityinfo', + SHOWCLASS : 'editing_show', + ACCESSHIDECLASS : 'accesshide' }; /** @@ -68,18 +72,14 @@ YUI.add('moodle-course-toolboxes', function(Y) { var status = ''; var value; - if (dimarea.hasClass(toggle_class)) { + if (button.hasClass(CSS.SHOWCLASS)) { status = 'hide'; value = 1; } else { status = 'show'; value = 0; } - - // Change the UI - dimarea.toggleClass(toggle_class); - // We need to toggle dimming on the description too - element.all(CSS.CONTENTAFTERLINK).toggleClass(CSS.DIMMEDTEXT); + // Update button info. var newstring = M.util.get_string(status, 'moodle'); hideicon.setAttrs({ 'alt' : newstring, @@ -88,6 +88,19 @@ YUI.add('moodle-course-toolboxes', function(Y) { button.set('title', newstring); button.set('className', 'editing_'+status); + // If activity is conditionally hidden, then don't toggle. + if (!dimarea.hasClass(CSS.CONDITIONALHIDDEN)) { + // Change the UI. + dimarea.toggleClass(toggle_class); + // We need to toggle dimming on the description too. + element.all(CSS.CONTENTAFTERLINK).toggleClass(CSS.DIMMEDTEXT); + } + // Toggle availablity info for conditional activities. + var availabilityinfo = element.one(CSS.AVAILABILITYINFODIV); + + if (availabilityinfo) { + availabilityinfo.toggleClass(CSS.ACCESSHIDECLASS); + } return value; }, /** -- 1.7.9.5 From 98197952cc12587ed11d8dd13922b19df137b772 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 19 Oct 2012 19:56:32 +0800 Subject: [PATCH 845/903] weekly release 2.3.2+ (fix!) --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index b25cd6c..6ccbfde 100644 --- a/version.php +++ b/version.php @@ -34,7 +34,7 @@ $version = 2012062502.09; // YYYYMMDD = weekly release date o // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.3+ (Build: 20121018)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20121018)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From d5fd21b6efed1eb925ef2ff3cb977e927a3d68af Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Tue, 9 Oct 2012 12:30:30 +0100 Subject: [PATCH 846/903] MDL-35571 theme_magazine: RTL fixes - WIKI title headings, ajax frontpage category/course chooser, right align logo, left align course name, left align login & user info. --- theme/magazine/style/core.css | 79 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 73 insertions(+), 6 deletions(-) diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css index a617287..2cd9613 100644 --- a/theme/magazine/style/core.css +++ b/theme/magazine/style/core.css @@ -52,6 +52,10 @@ div#headerinner { line-height: 30px; min-width: 400px; } +.dir-rtl #headright { + float: left; + min-width: 300px; +} #headright a { color: #fff; @@ -66,6 +70,10 @@ div#headerinner { font-size: 9px; } +.dir-rtl #headright div.langmenu { + float: left !important; +} + #headleft { float: left; height: 30px; @@ -74,6 +82,10 @@ div#headerinner { font-size: 12px; } +.dir-rtl #headleft { + float: right; +} + /** Logo and menu bar divs and wrap **/ #textcontainer-wrap { @@ -99,6 +111,10 @@ div.thetitle { float: left; } +.dir-rtl div.thetitle { + float: right; +} + #nologo { width: 337px; float: left; @@ -107,6 +123,11 @@ div.thetitle { margin-top: 40px; } +.dir-rtl #nologo { + float: right; + padding-right: 3px; +} + #nologo.nomenu { width: 100%; } @@ -118,25 +139,27 @@ div.thetitle { font-weight: 800; letter-spacing: -1px; line-height: 45px; - - } + #nologo a:hover { text-decoration: none; } + div.rightinfo { float: right; min-width: 470px; height: 130px; overflow: hidden; } +.dir-rtl div.rightinfo { + float: left; +} #menucontainer { height: 45px; margin-top: 40px; } - /** main content wraps **/ #outercontainer { @@ -191,6 +214,10 @@ div.jcontrolsleft { float: left; min-width: 100px; } +.dir-rtl div.jcontrolsleft { + float:right; + margin-right: 15px; +} div.jcontrolsright { float: right; @@ -199,6 +226,11 @@ div.jcontrolsright { margin-right: 15px; } +.dir-rtl div.jcontrolsright { + float: left; + margin-left: 15px; +} + div.jcontrolsright div.singlebutton, div.jcontrolsright div.forumsearch { margin: 5px 0px 0px; } @@ -243,6 +275,9 @@ div.johndocsleft { color: #333333; font-size: 11px; } +.dir-rtl div.johndocsleft { + float: right; +} /** Some breadcrumb style **/ @@ -410,7 +445,12 @@ div#jcontrols_button span.arrow.sep { /** inner block style for decent display of recent news, etc **/ -.block_recent_activity.block_docked div.content h2.main, .block_recent_activity.block_docked div.content h3.main, .side-pre .block div.content h2.main,.side-post .block div.content h2.main,.block div.content h3.main,.block div.content h2 { +.block_recent_activity.block_docked div.content h2.main, +.block_recent_activity.block_docked div.content h3.main, +.side-pre .block div.content h2.main, +.side-post .block div.content h2.main, +.block div.content h3.main, +.block div.content h2 { font-size: 13px; color: #333; font-weight: 800; @@ -448,7 +488,7 @@ div.yui3-widget-bd h1.helpheading { .yui-module.yui-overlay.yui-panel div.hd { background: #eeeeee url([[pix:theme|bart5]]) repeat-x 0% 90%; - } +} /**moodle dropdown css for yui menu **/ @@ -851,6 +891,10 @@ div.coursebox h3.name a { padding-left: 5px !important; } +.dir-rtl .unlist ul.teachers { + padding-right: 5px; +} + .unlist ul.teachers li { font-size: 10px; } @@ -893,6 +937,9 @@ div.course_category_tree div.category,div.course_category_tree div.category_labe div.course_category_tree div.category.with_children div.category_label { background-position: 0 55% !important; } +.dir-rtl div.course_category_tree div.category.with_children div.category_label { + background-position: right center !important; +} div.course_category_tree div.course.odd { background: #eee; @@ -906,6 +953,23 @@ div.category.subcategory.with_children { margin-left: 20px; } +.dir-rtl div.category.subcategory.with_children { + margin-right: 20px; +} + +.dir-rtl .course_category_tree .category .course_info { + padding-right: 20px; +} + +.dir-rtl.jsenabled .course_category_tree .category.with_children.collapsed .category_label { + backkground-position: right center !important; +} + +.dir-rtl .course_category_tree .category_label, +.dir-rtl .course_category_tree .category .course { + padding-right: 35px; +} + div.course_category_tree div.controls { font-size: 10px; color: #666; @@ -1025,6 +1089,9 @@ table.glossarypost td.entry h3 { margin-bottom: 3px; margin-top: 2px; } +#page-mod-wiki-view.dir-rtl h2.wiki_headingtitle { + text-align: right; +} /**HR in content blocks **/ @@ -1126,4 +1193,4 @@ div.singlebutton.forumaddnew { #page-course-info div.generalbox ul, #page-course-info div.generalbox li { list-style-type: none; -} \ No newline at end of file +} -- 1.7.9.5 From cd2ae155de61a4e477dadfba418fdc019a4f9e86 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Fri, 19 Oct 2012 23:39:01 +0100 Subject: [PATCH 847/903] MDL-36137 theme_magazine: changed forum and description info from center to left aligned. --- theme/magazine/style/core.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css index a617287..242e021 100644 --- a/theme/magazine/style/core.css +++ b/theme/magazine/style/core.css @@ -1040,7 +1040,7 @@ table.glossarypost td.entry h3 { div#intro { border: none; - text-align: center; + text-align: left; font-size: 14px; color: #333333; } -- 1.7.9.5 From 691b9c81cb7eef2a9f7cc7902d1d87e660862306 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Sat, 20 Oct 2012 00:34:52 +0000 Subject: [PATCH 848/903] Automatically generated installer lang files --- install/lang/en_fix/langconfig.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 install/lang/en_fix/langconfig.php diff --git a/install/lang/en_fix/langconfig.php b/install/lang/en_fix/langconfig.php new file mode 100644 index 0000000..d563203 --- /dev/null +++ b/install/lang/en_fix/langconfig.php @@ -0,0 +1,33 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['thislanguage'] = 'English (fixes)'; -- 1.7.9.5 From db16ec27536057adee2af49d2c2a53fd7a157f8d Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sun, 21 Oct 2012 01:39:30 +0100 Subject: [PATCH 849/903] MDL-31934 theme_base: Adds highlight color to unread forum posts. --- theme/base/style/core.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 4a5151b..481df9b 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -994,3 +994,16 @@ sup {vertical-align: super;} -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC; -moz-box-shadow: 0px 0px 10px 0px #CCCCCC; } + +/* Forumpost unread +-------------------------*/ + +#page-mod-forum-view .unread, +.forumpost.unread .row.header, +.path-course-view .unread, +span.unread { + background-color: #FFD; +} +.forumpost.unread .row.header { + border-bottom: 1px solid #DDD; +} -- 1.7.9.5 From 8be3d5ab030ab215333ebba7af07fdf5b0c10d47 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 21 Oct 2012 15:56:01 +0800 Subject: [PATCH 850/903] MDL-35297 book: replay some steps lost when book landed to core This commit replays, conditionally, all the upgrade steps from MOODLE_19_STABLE to MOODLE_23_STABLE in the mod_book activity. That guarentees that any site using the mod_book before landing to core, no matter if it was the latest or an outdated one will upgrade perfectly to the expected current version. As a general rule, everytime one contrib plugin lands to core, its complete upgrade code must be kept, at least until the core version that introduced it, is out completely from the upgrade requirement conditions. In this case, with the missing upgrade code being added to 2.4, it will be safe to delete the upgrade steps once 2.5 (or upwards) become a requirement. Never always. Conflicts: mod/book/version.php --- mod/book/db/upgrade.php | 146 ++++++++++++++++++++++++++++++++++++++ mod/book/db/upgradelib.php | 168 ++++++++++++++++++++++++++++++++++++++++++++ mod/book/version.php | 2 +- 3 files changed, 315 insertions(+), 1 deletion(-) create mode 100644 mod/book/db/upgradelib.php diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php index 3fb1085..c4709f0 100644 --- a/mod/book/db/upgrade.php +++ b/mod/book/db/upgrade.php @@ -40,6 +40,152 @@ function xmldb_book_upgrade($oldversion) { // Moodle v2.3.0 release upgrade line // Put any upgrade step following this + // Note: The next steps (up to 2012061710 included, are a "replay" of old upgrade steps, + // because some sites updated to Moodle 2.3 didn't have the latest contrib mod_book + // installed, so some required changes were missing. + // + // All the steps are run conditionally so sites upgraded from latest contrib mod_book or + // new (2.3 and upwards) sites won't get affected. + // + // See MDL-35297 and commit msg for more information. + + if ($oldversion < 2012061703) { + // Rename field summary on table book to intro + $table = new xmldb_table('book'); + $field = new xmldb_field('summary', XMLDB_TYPE_TEXT, null, null, null, null, null, 'name'); + + // Launch rename field summary + if ($dbman->field_exists($table, $field)) { + $dbman->rename_field($table, $field, 'intro'); + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061703, 'book'); + } + + if ($oldversion < 2012061704) { + // Define field introformat to be added to book + $table = new xmldb_table('book'); + $field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'intro'); + + // Launch add field introformat + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + // Conditionally migrate to html format in intro + // Si está activo el htmleditor!!!!! + if ($CFG->texteditors !== 'textarea') { + $rs = $DB->get_recordset('book', array('introformat'=>FORMAT_MOODLE), '', 'id,intro,introformat'); + foreach ($rs as $b) { + $b->intro = text_to_html($b->intro, false, false, true); + $b->introformat = FORMAT_HTML; + $DB->update_record('book', $b); + upgrade_set_timeout(); + } + unset($b); + $rs->close(); + } + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061704, 'book'); + } + + if ($oldversion < 2012061705) { + // Define field introformat to be added to book + $table = new xmldb_table('book_chapters'); + $field = new xmldb_field('contentformat', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'content'); + + // Launch add field introformat + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + + $DB->set_field('book_chapters', 'contentformat', FORMAT_HTML, array()); + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061705, 'book'); + } + + if ($oldversion < 2012061706) { + require_once("$CFG->dirroot/mod/book/db/upgradelib.php"); + + $sqlfrom = "FROM {book} b + JOIN {modules} m ON m.name = 'book' + JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = b.id)"; + + $count = $DB->count_records_sql("SELECT COUNT('x') $sqlfrom"); + + if ($rs = $DB->get_recordset_sql("SELECT b.id, b.course, cm.id AS cmid $sqlfrom ORDER BY b.course, b.id")) { + + $pbar = new progress_bar('migratebookfiles', 500, true); + + $i = 0; + foreach ($rs as $book) { + $i++; + upgrade_set_timeout(360); // set up timeout, may also abort execution + $pbar->update($i, $count, "Migrating book files - $i/$count."); + + $context = context_module::instance($book->cmid); + + mod_book_migrate_moddata_dir_to_legacy($book, $context, '/'); + + // remove dirs if empty + @rmdir("$CFG->dataroot/$book->course/$CFG->moddata/book/$book->id/"); + @rmdir("$CFG->dataroot/$book->course/$CFG->moddata/book/"); + @rmdir("$CFG->dataroot/$book->course/$CFG->moddata/"); + @rmdir("$CFG->dataroot/$book->course/"); + } + $rs->close(); + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061706, 'book'); + } + + if ($oldversion < 2012061707) { + // Define field disableprinting to be dropped from book + $table = new xmldb_table('book'); + $field = new xmldb_field('disableprinting'); + + // Conditionally launch drop field disableprinting + if ($dbman->field_exists($table, $field)) { + $dbman->drop_field($table, $field); + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061707, 'book'); + } + + if ($oldversion < 2012061708) { + unset_config('book_tocwidth'); + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061708, 'book'); + } + + if ($oldversion < 2012061709) { + require_once("$CFG->dirroot/mod/book/db/upgradelib.php"); + + mod_book_migrate_all_areas(); + + upgrade_mod_savepoint(true, 2012061709, 'book'); + } + + if ($oldversion < 2012061710) { + + // Define field revision to be added to book + $table = new xmldb_table('book'); + $field = new xmldb_field('revision', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'customtitles'); + + // Conditionally launch add field revision + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + } + + // book savepoint reached + upgrade_mod_savepoint(true, 2012061710, 'book'); + } + // End of MDL-35297 "replayed" steps. return true; } diff --git a/mod/book/db/upgradelib.php b/mod/book/db/upgradelib.php new file mode 100644 index 0000000..5411930 --- /dev/null +++ b/mod/book/db/upgradelib.php @@ -0,0 +1,168 @@ +. + +/** + * Book module upgrade related helper functions + * + * @package mod_book + * @copyright 2010 Petr Skoda {@link http://skodak.org} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die; + +/** + * Migrate book files stored in moddata folders. + * + * Please note it was a big mistake to store the files there in the first place! + * + * @param stdClass $book + * @param stdClass $context + * @param string $path + * @return void + */ +function mod_book_migrate_moddata_dir_to_legacy($book, $context, $path) { + global $OUTPUT, $CFG; + + $base = "$CFG->dataroot/$book->course/$CFG->moddata/book/$book->id"; + $fulldir = $base.$path; + + if (!is_dir($fulldir)) { + // does not exist + return; + } + + $fs = get_file_storage(); + $items = new DirectoryIterator($fulldir); + + foreach ($items as $item) { + if ($item->isDot()) { + unset($item); // release file handle + continue; + } + + if ($item->isLink()) { + // do not follow symlinks - they were never supported in moddata, sorry + unset($item); // release file handle + continue; + } + + if ($item->isFile()) { + if (!$item->isReadable()) { + echo $OUTPUT->notification(" File not readable, skipping: ".$fulldir.$item->getFilename()); + unset($item); // release file handle + continue; + } + + $filepath = clean_param("/$CFG->moddata/book/$book->id".$path, PARAM_PATH); + $filename = clean_param($item->getFilename(), PARAM_FILE); + + if ($filename === '') { + // unsupported chars, sorry + unset($item); // release file handle + continue; + } + + if (textlib::strlen($filepath) > 255) { + echo $OUTPUT->notification(" File path longer than 255 chars, skipping: ".$fulldir.$item->getFilename()); + unset($item); // release file handle + continue; + } + + if (!$fs->file_exists($context->id, 'course', 'legacy', '0', $filepath, $filename)) { + $file_record = array('contextid'=>$context->id, 'component'=>'course', 'filearea'=>'legacy', 'itemid'=>0, 'filepath'=>$filepath, 'filename'=>$filename, + 'timecreated'=>$item->getCTime(), 'timemodified'=>$item->getMTime()); + $fs->create_file_from_pathname($file_record, $fulldir.$item->getFilename()); + } + $oldpathname = $fulldir.$item->getFilename(); + unset($item); // release file handle + @unlink($oldpathname); + + } else { + // migrate recursively all subdirectories + $oldpathname = $base.$item->getFilename().'/'; + $subpath = $path.$item->getFilename().'/'; + unset($item); // release file handle + mod_book_migrate_moddata_dir_to_legacy($book, $context, $subpath); + @rmdir($oldpathname); // deletes dir if empty + } + } + unset($items); // release file handles +} + +/** + * Migrate legacy files in intro and chapters + * @return void + */ +function mod_book_migrate_all_areas() { + global $DB; + + $rsbooks = $DB->get_recordset('book'); + foreach($rsbooks as $book) { + upgrade_set_timeout(360); // set up timeout, may also abort execution + $cm = get_coursemodule_from_instance('book', $book->id); + $context = context_module::instance($cm->id); + mod_book_migrate_area($book, 'intro', 'book', $book->course, $context, 'mod_book', 'intro', 0); + + $rschapters = $DB->get_recordset('book_chapters', array('bookid'=>$book->id)); + foreach ($rschapters as $chapter) { + mod_book_migrate_area($chapter, 'content', 'book_chapters', $book->course, $context, 'mod_book', 'chapter', $chapter->id); + } + $rschapters->close(); + } + $rsbooks->close(); +} + +/** + * Migrate one area, this should be probably part of moodle core... + * + * @param stdClass $record object to migrate files (book, chapter) + * @param string $field field in the record we are going to migrate + * @param string $table DB table containing the information to migrate + * @param int $courseid id of the course the book module belongs to + * @param context_module $context context of the book module + * @param string $component component to be used for the migrated files + * @param string $filearea filearea to be used for the migrated files + * @param int $itemid id to be used for the migrated files + * @return void + */ +function mod_book_migrate_area($record, $field, $table, $courseid, $context, $component, $filearea, $itemid) { + global $CFG, $DB; + + $fs = get_file_storage(); + + foreach(array(get_site()->id, $courseid) as $cid) { + $matches = null; + $ooldcontext = context_course::instance($cid); + if (preg_match_all("|$CFG->wwwroot/file.php(\?file=)?/$cid(/[^\s'\"&\?#]+)|", $record->$field, $matches)) { + $file_record = array('contextid'=>$context->id, 'component'=>$component, 'filearea'=>$filearea, 'itemid'=>$itemid); + foreach ($matches[2] as $i=>$filepath) { + if (!$file = $fs->get_file_by_hash(sha1("/$ooldcontext->id/course/legacy/0".$filepath))) { + continue; + } + try { + if (!$newfile = $fs->get_file_by_hash(sha1("/$context->id/$component/$filearea/$itemid".$filepath))) { + $fs->create_file_from_storedfile($file_record, $file); + } + $record->$field = str_replace($matches[0][$i], '@@PLUGINFILE@@'.$filepath, $record->$field); + } catch (Exception $ex) { + // ignore problems + } + $DB->set_field($table, $field, $record->$field, array('id'=>$record->id)); + } + } + } +} \ No newline at end of file diff --git a/mod/book/version.php b/mod/book/version.php index e187cb3..f37c00d 100644 --- a/mod/book/version.php +++ b/mod/book/version.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die; $module->component = 'mod_book'; // Full name of the plugin (used for diagnostics) -$module->version = 2012061702; // The current module version (Date: YYYYMMDDXX) +$module->version = 2012061710; // The current module version (Date: YYYYMMDDXX) $module->requires = 2012061700; // Requires this Moodle version $module->cron = 0; // Period for cron to check this module (secs) -- 1.7.9.5 From 9b5de362cfaeb3fe7a1a6c13e1c0be32f29fa940 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 25 Oct 2012 00:34:52 +0000 Subject: [PATCH 851/903] Automatically generated installer lang files --- install/lang/zh_tw/error.php | 2 +- install/lang/zh_tw/install.php | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/install/lang/zh_tw/error.php b/install/lang/zh_tw/error.php index e678417..0bedb5f 100644 --- a/install/lang/zh_tw/error.php +++ b/install/lang/zh_tw/error.php @@ -39,7 +39,7 @@ $string['cannotsavemd5file'] = '無法儲存 md5 檔案。'; $string['cannotsavezipfile'] = '無法儲存 ZIP 檔案。'; $string['cannotunzipfile'] = '無法解壓縮檔案。'; $string['componentisuptodate'] = '元件已經是最新的了。'; -$string['downloadedfilecheckfailed'] = '下載檔案檢查錯誤。'; +$string['downloadedfilecheckfailed'] = '下載的檔案檢查失敗'; $string['invalidmd5'] = '無效的 md5'; $string['missingrequiredfield'] = '缺少部份必填欄位'; $string['remotedownloaderror'] = '下載元件至伺服器失敗，檢查代理伺服器的設定、高度建議安裝PHP cURL，您必須手動下載{$a->url}，並且複製到伺服器"{$a->dest}" 解壓縮'; diff --git a/install/lang/zh_tw/install.php b/install/lang/zh_tw/install.php index c63fa29..0b79132 100644 --- a/install/lang/zh_tw/install.php +++ b/install/lang/zh_tw/install.php @@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die(); $string['admindirname'] = '管理目錄'; $string['availablelangs'] = '可使用的語言包'; $string['chooselanguagehead'] = '選擇一種語言'; -$string['chooselanguagesub'] = '請選擇在安裝過程中使用的語言。稍後您可以根據需要重新選擇用於網站和使用者的語言。'; +$string['chooselanguagesub'] = '請選擇在安裝過程中使用的語言。這語言將成為此網站預設的語言。稍後您可以根據需要重新選擇。'; $string['clialreadyconfigured'] = '檔案 config.php 已經存在，若你要安裝這一網站，請使用dmin/cli/install_database.php'; $string['clialreadyinstalled'] = '檔案 config.php 已經存在，若你要升級這一網站，請使用admin/cli/upgrade.php'; $string['cliinstallheader'] = 'Moodle {$a} 指令行安裝程式'; @@ -45,6 +45,8 @@ $string['datarootpermission'] = '資料目錄存取授權'; $string['dbprefix'] = '資料表名稱的前置字元'; $string['dirroot'] = 'Moodle目錄'; $string['environmenthead'] = '檢查您的環境中...'; +$string['environmentsub2'] = '每一個Moodle版本都有一些PHP版本的最低要求和一堆強制開啟的PHP擴展。在進行安裝或升級之前都需要作完整的環境檢查。
      +若你不知道要怎樣新的PHP版本或啟用PHP擴展，請聯絡伺服器管理員。'; $string['errorsinenvironment'] = '環境檢查失敗'; $string['installation'] = '安裝'; $string['langdownloaderror'] = '很不幸地，語言“{$a}”並未安裝。安裝過程將以英文繼續。'; @@ -53,15 +55,17 @@ $string['memorylimithelp'] = '

      PHP記憶體上限目前設定為{$a}。

      建議您儘可能將PHP的上限設得高一點，比如16M。 以下有幾種方式您可以試試:

        -
      1. 如果可以的話，用--enable-memory-limit重新編譯PHP。讓Moodle自己設定記憶體上限. -
      2. 如果您要使用php.ini檔, 您可以改變memory_limit這個設定值，例如到16M。如果您無法使用這個檔，您可以請您的管理者幫您做 -
      3. 在一些PHP伺服器上，您可以在Moodle目錄下，建立.htaccess檔，包含這行:

        php_value memory_limit 16M

        +
      4. 如果可以的話，用--enable-memory-limit重新編譯PHP。讓 Moodle 自己設定記憶體上限。 +
      5. 如果您要使用 php.ini 檔，您可以改變memory_limit這個設定值，例如到16M。如果您無法使用這個檔，您可以請您的管理者幫您做 +
      6. 在一些PHP伺服器上，您可以在Moodle目錄下，建立 .htaccess 檔，包含這行:

        php_value memory_limit 16M

        然而，在一些伺服器上，這將造成所有的 PHP 網頁無法運作(當您看這些網頁時，您就會看到錯誤) 因此，您就必須將 .htaccess 檔案移除。

      '; $string['paths'] = '路徑'; $string['pathserrcreatedataroot'] = '資料目錄 ({$a->dataroot})無法由這安裝程式建立'; $string['pathshead'] = '確認路徑'; $string['pathsrodataroot'] = '資料根目錄是無法寫入的'; +$string['pathsroparentdataroot'] = '上層目錄({$a->parent})是不可寫入的。安裝程式無法建立資料目錄({$a->dataroot})。'; +$string['pathssubdataroot'] = '你需要有一個地方讓Moodle可以儲存上傳的檔案。這一目錄對於網頁伺服器用戶(通常是"nobody"或"apache")而言，應該是可讀的和可寫的。但是它必須不能經由網頁直接存取。若此目錄不存在，這安裝程式將會試著建立它。'; $string['pathssubdirroot'] = 'Moodle安裝的完整目錄徑路'; $string['pathsunsecuredataroot'] = '資料根(Dataroot)目錄的位置不安全'; $string['pathswrongadmindir'] = '管理目錄不存在'; -- 1.7.9.5 From 1754dc2cb6cd98d64b417cf374ba082b8d65db41 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Sun, 7 Oct 2012 09:55:08 +0100 Subject: [PATCH 852/903] MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events --- course/lib.php | 2 +- course/yui/modchooser/modchooser.js | 30 ----------------------------- lib/javascript-static.js | 36 +++++++++++++++++++++++++++++++++++ lib/outputrenderers.php | 10 +++++++--- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/course/lib.php b/course/lib.php index f799b0d..c047c89 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1972,7 +1972,7 @@ function get_module_metadata($course, $modnames, $sectionreturn = 0) { if ($sm->string_exists('modulename_link', $modname)) { // Link to further info in Moodle docs $link = get_string('modulename_link', $modname); $linktext = get_string('morehelp'); - $module->help .= html_writer::tag('div', $OUTPUT->doc_link($link, $linktext), array('class' => 'helpdoclink')); + $module->help .= html_writer::tag('div', $OUTPUT->doc_link($link, $linktext, true), array('class' => 'helpdoclink')); } } $module->archetype = plugin_supports('mod', $modname, FEATURE_MOD_ARCHETYPE, MOD_ARCHETYPE_OTHER); diff --git a/course/yui/modchooser/modchooser.js b/course/yui/modchooser/modchooser.js index aea4040..f87a5ec 100644 --- a/course/yui/modchooser/modchooser.js +++ b/course/yui/modchooser/modchooser.js @@ -36,36 +36,6 @@ YUI.add('moodle-course-modchooser', function(Y) { // Catch the page toggle Y.all('.block_settings #settingsnav .type_course .modchoosertoggle a').on('click', this.toggle_mod_chooser, this); - - // Ensure that help links are opened in an appropriate popup - this.container.all('div.helpdoclink a').on('click', function(e) { - var anchor = e.target.ancestor('a', true); - - var args = { - 'name' : 'popup', - 'url' : anchor.getAttribute('href'), - 'option' : '' - }; - var options = [ - 'height=600', - 'width=800', - 'top=0', - 'left=0', - 'menubar=0', - 'location=0', - 'scrollbars', - 'resizable', - 'toolbar', - 'status', - 'directories=0', - 'fullscreen=0', - 'dependent' - ] - args.options = options.join(','); - - // Note: openpopup is provided by lib/javascript-static.js - openpopup(e, args); - }); }, /** * Update any section areas within the scope of the specified diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 6e7042d..25159f6 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1350,6 +1350,42 @@ function hide_item(itemid) { } } +M.util.help_popups = { + setup : function(Y) { + Y.one('body').delegate('click', this.open_popup, 'a.helplinkpopup', this); + }, + open_popup : function(e) { + // Prevent the default page action + e.preventDefault(); + + // Grab the anchor that was clicked + var anchor = e.target.ancestor('a', true); + var args = { + 'name' : 'popup', + 'url' : anchor.getAttribute('href'), + 'options' : '' + }; + var options = [ + 'height=600', + 'width=800', + 'top=0', + 'left=0', + 'menubar=0', + 'location=0', + 'scrollbars', + 'resizable', + 'toolbar', + 'status', + 'directories=0', + 'fullscreen=0', + 'dependent' + ] + args.options = options.join(','); + + openpopup(e, args); + } +} + M.util.help_icon = { Y : null, instance : null, diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 717ad00..0c6c16a 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -372,6 +372,9 @@ class core_renderer extends renderer_base { // flow player embedding support $this->page->requires->js_function_call('M.util.load_flowplayer'); + // Set up help link popups for all links with the helplinkpopup class + $this->page->requires->js_init_call('M.util.help_popups.setup'); + $this->page->requires->js_function_call('setTimeout', array('fix_column_widths()', 20)); $focus = $this->page->focuscontrol; @@ -1495,9 +1498,10 @@ class core_renderer extends renderer_base { * * @param string $path The page link after doc root and language, no leading slash. * @param string $text The text to be displayed for the link + * @param boolean $forcepopup Whether to force a popup regardless of the value of $CFG->doctonewwindow * @return string */ - public function doc_link($path, $text = '') { + public function doc_link($path, $text = '', $forcepopup = false) { global $CFG; $icon = $this->pix_icon('docs', $text, 'moodle', array('class'=>'iconhelp')); @@ -1505,8 +1509,8 @@ class core_renderer extends renderer_base { $url = new moodle_url(get_docs_url($path)); $attributes = array('href'=>$url); - if (!empty($CFG->doctonewwindow)) { - $attributes['id'] = $this->add_action_handler(new popup_action('click', $url)); + if (!empty($CFG->doctonewwindow) || $forcepopup) { + $attributes['class'] = 'helplinkpopup'; } return html_writer::tag('a', $icon.$text, $attributes); -- 1.7.9.5 From 8516492cc4725c3da7e05f4bc826b312475ec735 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Fri, 12 Oct 2012 10:41:33 +0100 Subject: [PATCH 853/903] MDL-36023 AJAX Move the instantiation of the dialogue to display time --- lib/yui/chooserdialogue/chooserdialogue.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/yui/chooserdialogue/chooserdialogue.js b/lib/yui/chooserdialogue/chooserdialogue.js index e67af29..9044c6a 100644 --- a/lib/yui/chooserdialogue/chooserdialogue.js +++ b/lib/yui/chooserdialogue/chooserdialogue.js @@ -20,11 +20,25 @@ YUI.add('moodle-core-chooserdialogue', function(Y) { // The initial overflow setting initialoverflow : '', + bodycontent : null, + headercontent : null, + instanceconfig : null, + setup_chooser_dialogue : function(bodycontent, headercontent, config) { + this.bodycontent = bodycontent; + this.headercontent = headercontent; + this.instanceconfig = config; + }, + + prepare_chooser : function () { + if (this.overlay) { + return; + } + // Set Default options var params = { - bodyContent : bodycontent.get('innerHTML'), - headerContent : headercontent.get('innerHTML'), + bodyContent : this.bodycontent.get('innerHTML'), + headerContent : this.headercontent.get('innerHTML'), draggable : true, visible : false, // Hide by default zindex : 100, // Display in front of other items @@ -33,16 +47,16 @@ YUI.add('moodle-core-chooserdialogue', function(Y) { } // Override with additional options - for (paramkey in config) { - params[paramkey] = config[paramkey]; + for (paramkey in this.instanceconfig) { + params[paramkey] = this.instanceconfig[paramkey]; } // Create the overlay this.overlay = new M.core.dialogue(params); // Remove the template for the chooser - bodycontent.remove(); - headercontent.remove(); + this.bodycontent.remove(); + this.headercontent.remove(); // Hide and then render the overlay this.overlay.hide(); @@ -63,6 +77,8 @@ YUI.add('moodle-core-chooserdialogue', function(Y) { * @return void */ display_chooser : function (e) { + this.prepare_chooser(); + // Stop the default event actions before we proceed e.preventDefault(); -- 1.7.9.5 From 238d0ca1cda2489f5637fa2fefcaa89fbbaa530d Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Sun, 7 Oct 2012 09:55:08 +0100 Subject: [PATCH 854/903] MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events --- course/lib.php | 2 +- course/yui/modchooser/modchooser.js | 30 ----------------------------- lib/javascript-static.js | 36 +++++++++++++++++++++++++++++++++++ lib/outputrenderers.php | 10 +++++++--- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/course/lib.php b/course/lib.php index ef150d0..7dad564 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1970,7 +1970,7 @@ function get_module_metadata($course, $modnames, $sectionreturn = null) { if ($sm->string_exists('modulename_link', $modname)) { // Link to further info in Moodle docs $link = get_string('modulename_link', $modname); $linktext = get_string('morehelp'); - $module->help .= html_writer::tag('div', $OUTPUT->doc_link($link, $linktext), array('class' => 'helpdoclink')); + $module->help .= html_writer::tag('div', $OUTPUT->doc_link($link, $linktext, true), array('class' => 'helpdoclink')); } } $module->archetype = plugin_supports('mod', $modname, FEATURE_MOD_ARCHETYPE, MOD_ARCHETYPE_OTHER); diff --git a/course/yui/modchooser/modchooser.js b/course/yui/modchooser/modchooser.js index aea4040..f87a5ec 100644 --- a/course/yui/modchooser/modchooser.js +++ b/course/yui/modchooser/modchooser.js @@ -36,36 +36,6 @@ YUI.add('moodle-course-modchooser', function(Y) { // Catch the page toggle Y.all('.block_settings #settingsnav .type_course .modchoosertoggle a').on('click', this.toggle_mod_chooser, this); - - // Ensure that help links are opened in an appropriate popup - this.container.all('div.helpdoclink a').on('click', function(e) { - var anchor = e.target.ancestor('a', true); - - var args = { - 'name' : 'popup', - 'url' : anchor.getAttribute('href'), - 'option' : '' - }; - var options = [ - 'height=600', - 'width=800', - 'top=0', - 'left=0', - 'menubar=0', - 'location=0', - 'scrollbars', - 'resizable', - 'toolbar', - 'status', - 'directories=0', - 'fullscreen=0', - 'dependent' - ] - args.options = options.join(','); - - // Note: openpopup is provided by lib/javascript-static.js - openpopup(e, args); - }); }, /** * Update any section areas within the scope of the specified diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 4189c37..5d9db5d 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1374,6 +1374,42 @@ function hide_item(itemid) { } } +M.util.help_popups = { + setup : function(Y) { + Y.one('body').delegate('click', this.open_popup, 'a.helplinkpopup', this); + }, + open_popup : function(e) { + // Prevent the default page action + e.preventDefault(); + + // Grab the anchor that was clicked + var anchor = e.target.ancestor('a', true); + var args = { + 'name' : 'popup', + 'url' : anchor.getAttribute('href'), + 'options' : '' + }; + var options = [ + 'height=600', + 'width=800', + 'top=0', + 'left=0', + 'menubar=0', + 'location=0', + 'scrollbars', + 'resizable', + 'toolbar', + 'status', + 'directories=0', + 'fullscreen=0', + 'dependent' + ] + args.options = options.join(','); + + openpopup(e, args); + } +} + M.util.help_icon = { Y : null, instance : null, diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index dd03dc8..8e3ff2a 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -372,6 +372,9 @@ class core_renderer extends renderer_base { // flow player embedding support $this->page->requires->js_function_call('M.util.load_flowplayer'); + // Set up help link popups for all links with the helplinkpopup class + $this->page->requires->js_init_call('M.util.help_popups.setup'); + $this->page->requires->js_function_call('setTimeout', array('fix_column_widths()', 20)); $focus = $this->page->focuscontrol; @@ -1495,9 +1498,10 @@ class core_renderer extends renderer_base { * * @param string $path The page link after doc root and language, no leading slash. * @param string $text The text to be displayed for the link + * @param boolean $forcepopup Whether to force a popup regardless of the value of $CFG->doctonewwindow * @return string */ - public function doc_link($path, $text = '') { + public function doc_link($path, $text = '', $forcepopup = false) { global $CFG; $icon = $this->pix_icon('docs', $text, 'moodle', array('class'=>'iconhelp')); @@ -1505,8 +1509,8 @@ class core_renderer extends renderer_base { $url = new moodle_url(get_docs_url($path)); $attributes = array('href'=>$url); - if (!empty($CFG->doctonewwindow)) { - $attributes['id'] = $this->add_action_handler(new popup_action('click', $url)); + if (!empty($CFG->doctonewwindow) || $forcepopup) { + $attributes['class'] = 'helplinkpopup'; } return html_writer::tag('a', $icon.$text, $attributes); -- 1.7.9.5 From 502821bbccbb6e3fb65b19549d0013336f9d56c7 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Sat, 27 Oct 2012 00:34:37 +0000 Subject: [PATCH 855/903] Automatically generated installer lang files --- install/lang/fi/install.php | 6 +++--- install/lang/zh_tw/error.php | 2 +- install/lang/zh_tw/install.php | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/install/lang/fi/install.php b/install/lang/fi/install.php index 57673d4..006fcb9 100644 --- a/install/lang/fi/install.php +++ b/install/lang/fi/install.php @@ -54,14 +54,14 @@ $string['memorylimithelp'] = '

      PHP muistiraja palvelimellesi on tällä hetkel

      Tämä saattaa aiheuttaa Moodlelle muistiongelmia myöhemmin, varsinkin jos sinulla on paljon mahdollisia moduuleita ja/tai paljon käyttäjiä.

      -

      Suosittelemme, että valitset asetuksiksi PHP:n korkeimmalla mahdollisella raja-arvolla, esimerkiksi 16M. +

      Suosittelemme, että valitset asetuksiksi PHP:n korkeimmalla mahdollisella raja-arvolla, esimerkiksi 40M. On olemassa monia tapoja joilla voit yrittää tehdä tämän:

      1. Jos pystyt, uudelleenkäännä PHP --enable-memory-limit. :llä. Tämä sallii Moodlen asettaa muistirajan itse.
        2. -
      2. Jos sinulla on pääsy php.ini tiedostoosi, voit muuttaa memory_limit asetuksen siellä johonkin kuten 16M. Jos sinulla ei ole pääsyoikeutta, voit kenties pyytää ylläpitäjää tekemään tämän puolestasi.
        3. +
      3. Jos sinulla on pääsy php.ini tiedostoosi, voit muuttaa memory_limit asetuksen siellä johonkin kuten 40M. Jos sinulla ei ole pääsyoikeutta, voit kenties pyytää ylläpitäjää tekemään tämän puolestasi.
      4. Joillain PHP palvelimilla voit luoda a .htaccess tiedoston Moodle hakemistossa, sisältäen tämän rivin: -

        php_value memory_limit 16M

        +

        php_value memory_limit 40M

        Kuitenkin, joillain palvelimilla tämä estää kaikkia PHP sivuja toimimasta (näet virheet, kun katsot sivuja), joten sinun täytyy poistaa .htaccess tiedosto.

      '; $string['paths'] = 'Polut'; diff --git a/install/lang/zh_tw/error.php b/install/lang/zh_tw/error.php index 0bedb5f..64144e6 100644 --- a/install/lang/zh_tw/error.php +++ b/install/lang/zh_tw/error.php @@ -44,5 +44,5 @@ $string['invalidmd5'] = '無效的 md5'; $string['missingrequiredfield'] = '缺少部份必填欄位'; $string['remotedownloaderror'] = '下載元件至伺服器失敗，檢查代理伺服器的設定、高度建議安裝PHP cURL，您必須手動下載{$a->url}，並且複製到伺服器"{$a->dest}" 解壓縮'; $string['wrongdestpath'] = '錯誤的目的路徑。'; -$string['wrongsourcebase'] = '錯誤的來源網址基礎。'; +$string['wrongsourcebase'] = '錯誤的來源基礎網址。'; $string['wrongzipfilename'] = '錯誤的 ZIP 檔名。'; diff --git a/install/lang/zh_tw/install.php b/install/lang/zh_tw/install.php index 0b79132..32415de 100644 --- a/install/lang/zh_tw/install.php +++ b/install/lang/zh_tw/install.php @@ -36,10 +36,10 @@ $string['chooselanguagehead'] = '選擇一種語言'; $string['chooselanguagesub'] = '請選擇在安裝過程中使用的語言。這語言將成為此網站預設的語言。稍後您可以根據需要重新選擇。'; $string['clialreadyconfigured'] = '檔案 config.php 已經存在，若你要安裝這一網站，請使用dmin/cli/install_database.php'; $string['clialreadyinstalled'] = '檔案 config.php 已經存在，若你要升級這一網站，請使用admin/cli/upgrade.php'; -$string['cliinstallheader'] = 'Moodle {$a} 指令行安裝程式'; +$string['cliinstallheader'] = 'Moodle {$a} 命令列安裝程式'; $string['databasehost'] = '資料庫主機'; $string['databasename'] = '資料庫名稱'; -$string['databasetypehead'] = '選擇資料庫磁碟機'; +$string['databasetypehead'] = '選擇資料庫裝置'; $string['dataroot'] = '資料目錄'; $string['datarootpermission'] = '資料目錄存取授權'; $string['dbprefix'] = '資料表名稱的前置字元'; @@ -47,7 +47,7 @@ $string['dirroot'] = 'Moodle目錄'; $string['environmenthead'] = '檢查您的環境中...'; $string['environmentsub2'] = '每一個Moodle版本都有一些PHP版本的最低要求和一堆強制開啟的PHP擴展。在進行安裝或升級之前都需要作完整的環境檢查。
      若你不知道要怎樣新的PHP版本或啟用PHP擴展，請聯絡伺服器管理員。'; -$string['errorsinenvironment'] = '環境檢查失敗'; +$string['errorsinenvironment'] = '環境檢查失敗!'; $string['installation'] = '安裝'; $string['langdownloaderror'] = '很不幸地，語言“{$a}”並未安裝。安裝過程將以英文繼續。'; $string['memorylimithelp'] = '

      PHP記憶體上限目前設定為{$a}。

      @@ -65,8 +65,10 @@ $string['pathserrcreatedataroot'] = '資料目錄 ({$a->dataroot})無法由這 $string['pathshead'] = '確認路徑'; $string['pathsrodataroot'] = '資料根目錄是無法寫入的'; $string['pathsroparentdataroot'] = '上層目錄({$a->parent})是不可寫入的。安裝程式無法建立資料目錄({$a->dataroot})。'; +$string['pathssubadmindir'] = '有些網站主機使用/admin這個網址來瀏覽控制面版或其他功能。很不幸，這個設定和Moodle管理頁面的標準路徑產生衝突。這個問題可以解決，只需在您的安裝目錄中把admin更換名稱，然後把新名稱輸入到這裡。例如moodleadmin這麼做會改變Moodle中的管理連接。'; $string['pathssubdataroot'] = '你需要有一個地方讓Moodle可以儲存上傳的檔案。這一目錄對於網頁伺服器用戶(通常是"nobody"或"apache")而言，應該是可讀的和可寫的。但是它必須不能經由網頁直接存取。若此目錄不存在，這安裝程式將會試著建立它。'; -$string['pathssubdirroot'] = 'Moodle安裝的完整目錄徑路'; +$string['pathssubdirroot'] = 'Moodle安裝的完整目錄路徑。'; +$string['pathssubwwwroot'] = '可以瀏覽到Moodle的完整網址。Moodle不支援透過多個網址瀏覽，如果您的往佔有多個公開網址，您必須把這個網址以外的網址都設定為永久重新導向。如果您的網站可以透過內部網址瀏覽，有可以透過這個公開網址瀏覽，那麼請設定DNS內部使網路使用者也能使用的空該網址。如果此網址不正確，請在瀏覽器中修改URL來重新安裝，並設定另一個網址。'; $string['pathsunsecuredataroot'] = '資料根(Dataroot)目錄的位置不安全'; $string['pathswrongadmindir'] = '管理目錄不存在'; $string['phpextension'] = '{$a} PHP擴展'; -- 1.7.9.5 From c777ad2785201187705087a84211db33649303fb Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Sun, 28 Oct 2012 00:34:02 +0000 Subject: [PATCH 856/903] Automatically generated installer lang files --- install/lang/zh_tw/error.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lang/zh_tw/error.php b/install/lang/zh_tw/error.php index 64144e6..28af033 100644 --- a/install/lang/zh_tw/error.php +++ b/install/lang/zh_tw/error.php @@ -40,7 +40,7 @@ $string['cannotsavezipfile'] = '無法儲存 ZIP 檔案。'; $string['cannotunzipfile'] = '無法解壓縮檔案。'; $string['componentisuptodate'] = '元件已經是最新的了。'; $string['downloadedfilecheckfailed'] = '下載的檔案檢查失敗'; -$string['invalidmd5'] = '無效的 md5'; +$string['invalidmd5'] = '這檢查變項是錯的，再試一次。'; $string['missingrequiredfield'] = '缺少部份必填欄位'; $string['remotedownloaderror'] = '下載元件至伺服器失敗，檢查代理伺服器的設定、高度建議安裝PHP cURL，您必須手動下載{$a->url}，並且複製到伺服器"{$a->dest}" 解壓縮'; $string['wrongdestpath'] = '錯誤的目的路徑。'; -- 1.7.9.5 From 33407de5b691c579b0e6a8b0c53387cb60cfca9e Mon Sep 17 00:00:00 2001 From: Charles Fulton Date: Wed, 17 Oct 2012 11:07:12 -0700 Subject: [PATCH 857/903] MDL-36105 grades: use consistent icon classs --- grade/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grade/lib.php b/grade/lib.php index d7d3b5b..a1e634b 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -1503,7 +1503,7 @@ class grade_structure { $url->param('action', 'show'); - $hideicon = $OUTPUT->action_icon($url, new pix_icon('t/'.$type, $tooltip, 'moodle', array('alt'=>$strshow, 'class'=>'iconsmall'))); + $hideicon = $OUTPUT->action_icon($url, new pix_icon('t/'.$type, $tooltip, 'moodle', array('alt'=>$strshow, 'class'=>'smallicon'))); } else { $url->param('action', 'hide'); -- 1.7.9.5 From 41db2a5afc47e12cb1dc9157918201ad0aa476cb Mon Sep 17 00:00:00 2001 From: Michael Aherne Date: Wed, 17 Oct 2012 12:37:43 +0100 Subject: [PATCH 858/903] MDL-36101 auth_shibboleth Show appropriate error message for suspended accounts --- auth/shibboleth/index.php | 7 ++++--- auth/shibboleth/lang/en/auth_shibboleth.php | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php index a1e4a1c..49b510f 100644 --- a/auth/shibboleth/index.php +++ b/auth/shibboleth/index.php @@ -38,9 +38,9 @@ /// Check if the user has actually submitted login data to us - if ($shibbolethauth->user_login($frm->username, $frm->password)) { + if ($shibbolethauth->user_login($frm->username, $frm->password) + && $user = authenticate_user_login($frm->username, $frm->password)) { - $user = authenticate_user_login($frm->username, $frm->password); enrol_check_plugins($user); session_set_user($user); @@ -84,7 +84,8 @@ } else { - // For some weird reason the Shibboleth user couldn't be authenticated + // The Shibboleth user couldn't be mapped to a valid Moodle user + print_error('shib_invalid_account_error', 'auth_shibboleth'); } } diff --git a/auth/shibboleth/lang/en/auth_shibboleth.php b/auth/shibboleth/lang/en/auth_shibboleth.php index ca0f251..aace9a1 100644 --- a/auth/shibboleth/lang/en/auth_shibboleth.php +++ b/auth/shibboleth/lang/en/auth_shibboleth.php @@ -51,6 +51,7 @@ $string['auth_shib_no_organizations_warning'] = 'If you want to use the integrat $string['auth_shib_only'] = 'Shibboleth only'; $string['auth_shib_only_description'] = 'Check this option if a Shibboleth authentication shall be enforced'; $string['auth_shib_username_description'] = 'Name of the webserver Shibboleth environment variable that shall be used as Moodle username'; +$string['shib_invalid_account_error'] = 'You seem to be Shibboleth authenticated but Moodle has no valid account for your username. Your account may not exist or it may have been suspended.'; $string['shib_no_attributes_error'] = 'You seem to be Shibboleth authenticated but Moodle didn\'t receive any user attributes. Please check that your Identity Provider releases the necessary attributes ({$a}) to the Service Provider Moodle is running on or inform the webmaster of this server.'; $string['shib_not_all_attributes_error'] = 'Moodle needs certain Shibboleth attributes which are not present in your case. The attributes are: {$a}
      Please contact the webmaster of this server or your Identity Provider.'; $string['shib_not_set_up_error'] = 'Shibboleth authentication doesn\'t seem to be set up correctly because no Shibboleth environment variables are present for this page. Please consult the README for further instructions on how to set up Shibboleth authentication or contact the webmaster of this Moodle installation.'; -- 1.7.9.5 From 272dfda3cfc421ca7ce001be1404f4b19ef451e2 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Wed, 10 Oct 2012 11:01:52 +0100 Subject: [PATCH 859/903] MDL-35959 Correct footer for M.core.dialogue --- .../notification/assets/skins/sam/notification.css | 2 +- enrol/yui/notification/notification.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/enrol/yui/notification/assets/skins/sam/notification.css b/enrol/yui/notification/assets/skins/sam/notification.css index f49a799..66cddda 100644 --- a/enrol/yui/notification/assets/skins/sam/notification.css +++ b/enrol/yui/notification/assets/skins/sam/notification.css @@ -6,7 +6,7 @@ .moodle-dialogue-base .moodle-dialogue-hd {font-size:110%;color:inherit;font-weight:bold;text-align:left;padding:5px 6px;margin:0;border-bottom:1px solid #ccc;background-color:#f6f6f6;} .moodle-dialogue-base .closebutton {background-image:url(sprite.png);width:25px;height:15px;background-repeat:no-repeat;float:right;vertical-align:middle;display:inline-block;cursor:pointer;} .moodle-dialogue-base .moodle-dialogue-bd {padding:5px; overflow: auto;} -.moodle-dialogue-base .moodle-dialogue-fd {} +.moodle-dialogue-base .moodle-dialogue-ft {} .moodle-dialogue-confirm .confirmation-dialogue {text-align:center;} .moodle-dialogue-confirm .confirmation-message {margin:0.5em 1em;} diff --git a/enrol/yui/notification/notification.js b/enrol/yui/notification/notification.js index 8b91443..2ed9af0 100644 --- a/enrol/yui/notification/notification.js +++ b/enrol/yui/notification/notification.js @@ -21,7 +21,7 @@ var DIALOGUE_NAME = 'Moodle dialogue', HEADER : 'moodle-dialogue-hd', BODY : 'moodle-dialogue-bd', CONTENT : 'moodle-dialogue-content', - FOOTER : 'moodle-dialogue-fd', + FOOTER : 'moodle-dialogue-ft', HIDDEN : 'hidden', LIGHTBOX : 'moodle-dialogue-lightbox' }; @@ -35,7 +35,7 @@ var DIALOGUE = function(config) { .append(C('
      ') .append(C('
      ')) .append(C('
      ')) - .append(C('
      '))); + .append(C('
      '))); Y.one(document.body).append(config.notificationBase); config.srcNode = '#'+id; config.width = config.width || '400px'; -- 1.7.9.5 From 3fd76b3de5be382b45efbf5ac8a60d9fc90ba11c Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Tue, 30 Oct 2012 11:43:09 +0000 Subject: [PATCH 860/903] MDL-31934 mod/forum: Added CSS fix to mod/forum/styles.css for unread forumposts also reversed a previous commit in theme/base/core.css. --- mod/forum/styles.css | 13 +++++++++++++ theme/base/style/core.css | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mod/forum/styles.css b/mod/forum/styles.css index fe824c4..0e544df 100644 --- a/mod/forum/styles.css +++ b/mod/forum/styles.css @@ -91,3 +91,16 @@ /** Unknown Styles ??? */ #email .unsubscribelink {margin-top:20px;} + + +/* Forumpost unread +-------------------------*/ +#page-mod-forum-view .unread, +.forumpost.unread .row.header, +.path-course-view .unread, +span.unread { + background-color: #FFD; +} +.forumpost.unread .row.header { + border-bottom: 1px solid #DDD; +} \ No newline at end of file diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 481df9b..4a5151b 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -994,16 +994,3 @@ sup {vertical-align: super;} -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC; -moz-box-shadow: 0px 0px 10px 0px #CCCCCC; } - -/* Forumpost unread --------------------------*/ - -#page-mod-forum-view .unread, -.forumpost.unread .row.header, -.path-course-view .unread, -span.unread { - background-color: #FFD; -} -.forumpost.unread .row.header { - border-bottom: 1px solid #DDD; -} -- 1.7.9.5 From edf170c34194e21144df4eb5b598ddfcdc3daecd Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 31 Oct 2012 00:36:35 +0000 Subject: [PATCH 861/903] Automatically generated installer lang files --- install/lang/zh_tw/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lang/zh_tw/admin.php b/install/lang/zh_tw/admin.php index 5eb6cc3..43f6dd0 100644 --- a/install/lang/zh_tw/admin.php +++ b/install/lang/zh_tw/admin.php @@ -34,8 +34,8 @@ $string['clianswerno'] = 'n'; $string['cliansweryes'] = 'y'; $string['cliincorrectvalueerror'] = '錯誤，不正確的值 "{$a->value}" 用於 "{$a->option}"'; $string['cliincorrectvalueretry'] = '不正確的值，請再試一次'; -$string['clitypevalue'] = '打入一值'; -$string['clitypevaluedefault'] = '打入一值，按Enter可使用預設值({$a})'; +$string['clitypevalue'] = '輸入值'; +$string['clitypevaluedefault'] = '輸入值，按Enter可使用預設值({$a})'; $string['cliunknowoption'] = '不認得的選項： {$a} 請使用 --幫助 選項。'; $string['cliyesnoprompt'] = '輸入y(是) 或n(否)'; -- 1.7.9.5 From d0d6d5fc72a0fe40e786a2aa42047efe69f918d5 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 2 Oct 2012 14:28:55 +0800 Subject: [PATCH 862/903] MDL-28235 form: Help button popup close accessibility improved AMOS BEGIN CPY [close,editor],[close,form] AMOS END --- lang/en/form.php | 1 + lib/javascript-static.js | 8 ++++++-- lib/outputrenderers.php | 2 ++ theme/base/style/core.css | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lang/en/form.php b/lang/en/form.php index d55667d..d926cd2 100644 --- a/lang/en/form.php +++ b/lang/en/form.php @@ -25,6 +25,7 @@ $string['addfields'] = 'Add {$a} fields to form'; $string['advancedelement'] = 'Advanced element'; +$string['close'] = 'Close'; $string['day'] = 'Day'; $string['display'] = 'Display'; $string['err_alphanumeric'] = 'You must enter only letters or numbers here.'; diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 4189c37..158e5ff 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1388,16 +1388,19 @@ M.util.help_icon = { event.preventDefault(); if (M.util.help_icon.instance === null) { var Y = M.util.help_icon.Y; - Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', function(Y) { + Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', 'escape', function(Y) { var help_content_overlay = { helplink : null, overlay : null, init : function() { - var closebtn = Y.Node.create(''); + var strclose = Y.Escape.html(M.str.form.close); + var closebtn = Y.Node.create(''+strclose+''); + var footerbtn = Y.Node.create(''); // Create an overlay from markup this.overlay = new Y.Overlay({ headerContent: closebtn, + footerContent: footerbtn, bodyContent: '', id: 'helppopupbox', width:'400px', @@ -1407,6 +1410,7 @@ M.util.help_icon = { this.overlay.render(Y.one(document.body)); closebtn.on('click', this.overlay.hide, this.overlay); + footerbtn.on('click', this.overlay.hide, this.overlay); var boundingBox = this.overlay.get("boundingBox"); diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index dd03dc8..b49c69b 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1733,6 +1733,7 @@ class core_renderer extends renderer_base { $output = html_writer::tag('a', $output, $attributes); $this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false)))); + $this->page->requires->string_for_js('close', 'form'); // and finally span return html_writer::tag('span', $output, array('class' => 'helplink')); @@ -1798,6 +1799,7 @@ class core_renderer extends renderer_base { $output = html_writer::tag('a', $output, $attributes); $this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false)))); + $this->page->requires->string_for_js('close', 'form'); // and finally span return html_writer::tag('span', $output, array('class' => 'helplink')); diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 4a5151b..ee93c4f 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -477,6 +477,8 @@ body.tag .managelink {padding: 5px;} #helppopupbox {background-color: #eee; border: 1px solid #848484;z-index: 10000 !important;} #helppopupbox .yui3-widget-hd {float:right;margin:3px 3px 0 0;} #helppopupbox .yui3-widget-bd {margin:0 1em 1em 1em;border-top:1px solid #eee;} +#helppopupbox .yui3-widget-ft {text-align: center;} +#helppopupbox .yui3-widget-ft .closebtn {margin:0 1em 1em 1em;} #helppopupbox .helpheading {font-size: 1em;} #helppopupbox .spinner {margin:1em;} -- 1.7.9.5 From b27daf9e736e9bc1a482f4e12017cbcbe82edc0a Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 2 Oct 2012 14:34:15 +0800 Subject: [PATCH 863/903] MDL-28235 form: Removed close icon of help icon popups --- lib/javascript-static.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 158e5ff..2b6cefd 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1395,11 +1395,9 @@ M.util.help_icon = { init : function() { var strclose = Y.Escape.html(M.str.form.close); - var closebtn = Y.Node.create(''+strclose+''); var footerbtn = Y.Node.create(''); // Create an overlay from markup this.overlay = new Y.Overlay({ - headerContent: closebtn, footerContent: footerbtn, bodyContent: '', id: 'helppopupbox', @@ -1409,7 +1407,6 @@ M.util.help_icon = { }); this.overlay.render(Y.one(document.body)); - closebtn.on('click', this.overlay.hide, this.overlay); footerbtn.on('click', this.overlay.hide, this.overlay); var boundingBox = this.overlay.get("boundingBox"); @@ -1426,9 +1423,6 @@ M.util.help_icon = { this.overlay.hide(); } }, this); - - Y.on("key", this.close, closebtn , "down:13", this); - closebtn.on('click', this.close, this); }, close : function(e) { -- 1.7.9.5 From 9740e053f2806635404d3b1275166d56fd402ef6 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 31 Oct 2012 12:59:07 +0800 Subject: [PATCH 864/903] MDL-28235 form: Removed reference to unexisting close button in help popup --- lib/javascript-static.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 2b6cefd..ba1651b 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1462,8 +1462,6 @@ M.util.help_icon = { Y.io(ajaxurl, cfg); this.overlay.show(); - - Y.one('#closehelpbox').focus(); }, display_callback : function(content) { -- 1.7.9.5 From 93efeb53529ce5797db81e92bcde5f86e81e33ab Mon Sep 17 00:00:00 2001 From: Adam Olley Date: Fri, 19 Oct 2012 13:43:30 +1030 Subject: [PATCH 865/903] MDL-36130: mod_assign: migrate logs when migrating from mod_assignment --- mod/assign/upgradelib.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mod/assign/upgradelib.php b/mod/assign/upgradelib.php index 92d59a0..e9a7f0f 100644 --- a/mod/assign/upgradelib.php +++ b/mod/assign/upgradelib.php @@ -162,6 +162,11 @@ class assign_upgrade_manager { } $completiondone = true; + // Migrate log entries so we don't lose them. + $logparams = array('cmid' => $oldcoursemodule->id, 'course' => $oldcoursemodule->course); + $DB->set_field('log', 'module', 'assign', $logparams); + $DB->set_field('log', 'cmid', $newcoursemodule->id, $logparams); + // copy all the submission data (and get plugins to do their bit) $oldsubmissions = $DB->get_records('assignment_submissions', array('assignment'=>$oldassignmentid)); @@ -260,6 +265,10 @@ class assign_upgrade_manager { $DB->update_record('course_completion_criteria', $criteria); } } + // Roll back the log changes + $logparams = array('cmid' => $newcoursemodule->id, 'course' => $newcoursemodule->course); + $DB->set_field('log', 'module', 'assignment', $logparams); + $DB->set_field('log', 'cmid', $oldcoursemodule->id, $logparams); // roll back the advanced grading update if ($gradingarea) { foreach ($gradeidmap as $newgradeid => $oldsubmissionid) { -- 1.7.9.5 From b5b882df60bede68c7688e274847902a30267dd1 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 31 Oct 2012 19:30:08 +0100 Subject: [PATCH 866/903] MDL-36304 - Left align "marked out of" in RTL Q preview Credit goes to Nadav Kavalerchik for fixing it @ MDL-36033 --- mod/quiz/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 6efbdbc..23fe7d5 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -415,5 +415,6 @@ bank window's title is prominent enough*/ #page-mod-quiz-edit.dir-rtl div.quizcontents {clear: right;float: right;} #page-mod-quiz-edit.dir-rtl .questionbankwindow.block {float: left;} #page-question-edit.dir-rtl td.creatorname, #page-question-edit.dir-rtl td.modifiername {text-align: center;} +.path-question.dir-rtl input[name="maxmark"], .path-question-type.dir-rtl input[name="defaultmark"], #page-mod-quiz-edit.dir-rtl div.points input {direction: ltr;text-align: left;} -- 1.7.9.5 From f1c3b5b3b39af05796b7eef3419cc6e6dfc42c88 Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Thu, 1 Nov 2012 00:36:39 +0000 Subject: [PATCH 867/903] Automatically generated installer lang files --- install/lang/en_kids/langconfig.php | 33 +++++++++++++++++++++++++++++++++ install/lang/ja_kids/langconfig.php | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 install/lang/en_kids/langconfig.php create mode 100644 install/lang/ja_kids/langconfig.php diff --git a/install/lang/en_kids/langconfig.php b/install/lang/en_kids/langconfig.php new file mode 100644 index 0000000..7a195a4 --- /dev/null +++ b/install/lang/en_kids/langconfig.php @@ -0,0 +1,33 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['thislanguage'] = 'English for kids'; diff --git a/install/lang/ja_kids/langconfig.php b/install/lang/ja_kids/langconfig.php new file mode 100644 index 0000000..6eb3957 --- /dev/null +++ b/install/lang/ja_kids/langconfig.php @@ -0,0 +1,35 @@ +. + +/** + * Automatically generated strings for Moodle installer + * + * Do not edit this file manually! It contains just a subset of strings + * needed during the very first steps of installation. This file was + * generated automatically by export-installer.php (which is part of AMOS + * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the + * list of strings defined in /install/stringnames.txt. + * + * @package installer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$string['parentlanguage'] = 'ja'; +$string['thisdirection'] = 'ltr'; +$string['thislanguage'] = '日本語 小学生'; -- 1.7.9.5 From 391f8b395a3f02a6ee25b09fbeb1c95deb04e702 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Thu, 1 Nov 2012 00:28:59 +0100 Subject: [PATCH 868/903] MDL-36315 backup: reduce the DST tests failing-window This reduces the period of time that some of the unit tests for calculate_next_automated_backup() are failing right now (from 1week to just some hours around the DST changes). Note it's not the final solution because they will still fail when New_York or Brussels DST changes are about to happen, but to get this completely fixed we'll need to wait to switch from current custom TZ/DST support to PHP built-in one. --- backup/util/helper/tests/cronhelper_test.php | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/backup/util/helper/tests/cronhelper_test.php b/backup/util/helper/tests/cronhelper_test.php index 7afd1be..d0e92af 100644 --- a/backup/util/helper/tests/cronhelper_test.php +++ b/backup/util/helper/tests/cronhelper_test.php @@ -281,9 +281,13 @@ class backup_cron_helper_testcase extends advanced_testcase { $this->assertEquals(date('w-15:00', strtotime('tomorrow')), date('w-H:i', $next)); // Let's have a Belgian beer! (UTC+1 / UTC+2 DST). + // Warning: Some of these tests will fail if executed "around" + // 'Europe/Brussels' DST changes (last Sunday in March and + // last Sunday in October right now - 2012). Once Moodle + // moves to PHP TZ support this could be fixed properly. date_default_timezone_set('Europe/Brussels'); $now = strtotime('18:00:00'); - $dst = date('I'); + $dst = date('I', $now); $timezone = -10.0; // 7am for the user. $next = backup_cron_automated_helper::calculate_next_automated_backup($timezone, $now); @@ -321,9 +325,13 @@ class backup_cron_helper_testcase extends advanced_testcase { $this->assertEquals($expected, date('w-H:i', $next)); // The big apple! (UTC-5 / UTC-4 DST). + // Warning: Some of these tests will fail if executed "around" + // 'America/New_York' DST changes (2nd Sunday in March and + // 1st Sunday in November right now - 2012). Once Moodle + // moves to PHP TZ support this could be fixed properly. date_default_timezone_set('America/New_York'); $now = strtotime('18:00:00'); - $dst = date('I'); + $dst = date('I', $now); $timezone = -10.0; // 1pm for the user. $next = backup_cron_automated_helper::calculate_next_automated_backup($timezone, $now); @@ -365,9 +373,14 @@ class backup_cron_helper_testcase extends advanced_testcase { set_config('backup_auto_hour', '20', 'backup'); set_config('backup_auto_minute', '00', 'backup'); + // Note: These tests should not fail because they are "unnafected" + // by DST changes, as far as execution always happens on Monday and + // Saturday and those week days are not, right now, the ones rulez + // to peform the DST changes (Sunday is). This may change if rules + // are modified in the future. date_default_timezone_set('Europe/Brussels'); $now = strtotime('next Monday 18:00:00'); - $dst = date('I'); + $dst = date('I', $now); $timezone = -12.0; // 1pm for the user. $next = backup_cron_automated_helper::calculate_next_automated_backup($timezone, $now); @@ -404,9 +417,14 @@ class backup_cron_helper_testcase extends advanced_testcase { set_config('backup_auto_hour', '02', 'backup'); set_config('backup_auto_minute', '00', 'backup'); + // Note: These tests should not fail because they are "unnafected" + // by DST changes, as far as execution always happens on Monday and + // Saturday and those week days are not, right now, the ones rulez + // to peform the DST changes (Sunday is). This may change if rules + // are modified in the future. date_default_timezone_set('America/New_York'); $now = strtotime('next Monday 04:00:00'); - $dst = date('I'); + $dst = date('I', $now); $timezone = -12.0; // 8pm for the user. $next = backup_cron_automated_helper::calculate_next_automated_backup($timezone, $now); -- 1.7.9.5 From d402e05ba7bdd88482e58aeab5225329855db891 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 1 Nov 2012 14:16:33 +0800 Subject: [PATCH 869/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 6ccbfde..083bdd1 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.09; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.10; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20121018)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20121101)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From 1139dff6ef1e6c55c3b8394feede20bef621df51 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 30 Oct 2012 15:24:09 +0800 Subject: [PATCH 870/903] MDL-36271 feedback: Fixed variable typo --- mod/feedback/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php index 8c6dd59..e4a0b8a 100644 --- a/mod/feedback/lib.php +++ b/mod/feedback/lib.php @@ -400,7 +400,7 @@ function feedback_get_recent_mod_activity(&$activities, &$index, $sql .= " WHERE fc.timemodified > ? AND fk.id = ? "; $sqlargs[] = $timemodified; - $sqlargs[] = $cm->instace; + $sqlargs[] = $cm->instance; if ($userid) { $sql .= " AND u.id = ? "; -- 1.7.9.5 From 37ceb6cbed3eb68671a504649cd0d8a9b48788c8 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Fri, 26 Oct 2012 17:33:57 +0800 Subject: [PATCH 871/903] MDL-36092 Course/AJAX Ensure that dropdown resource pickers are shown when JS is disabled --- course/lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/course/lib.php b/course/lib.php index 51b4b0c..7c05094 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1876,8 +1876,9 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false, $output = html_writer::tag('div', $output, array('class' => 'hiddenifjs addresourcedropdown')); $modchooser = html_writer::tag('div', $modchooser, array('class' => 'visibleifjs addresourcemodchooser')); } else { - $output = html_writer::tag('div', $output, array('class' => 'visibleifjs addresourcedropdown')); - $modchooser = html_writer::tag('div', $modchooser, array('class' => 'hiddenifjs addresourcemodchooser')); + // If the module chooser is disabled, we need to ensure that the dropdowns are shown even if javascript is disabled + $output = html_writer::tag('div', $output, array('class' => 'show addresourcedropdown')); + $modchooser = html_writer::tag('div', $modchooser, array('class' => 'hide addresourcemodchooser')); } $output = $modchooser . $output; } -- 1.7.9.5 From 152dbe5d5260bd2ec3a5333775989051c3441e1b Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 29 Sep 2012 12:33:21 +0200 Subject: [PATCH 872/903] MDL-35512 - Two left pointing arrows appear after clicking "left indent activity/resource" arrow, when in RTL mode --- course/yui/toolboxes/toolboxes.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js index db7dae8..b3eb066 100644 --- a/course/yui/toolboxes/toolboxes.js +++ b/course/yui/toolboxes/toolboxes.js @@ -459,10 +459,16 @@ YUI.add('moodle-course-toolboxes', function(Y) { */ add_moveleft : function(target) { var left_string = M.util.get_string('moveleft', 'moodle'); + var moveimage = 't/left'; // ltr mode + if ( Y.one(document.body).hasClass('dir-rtl') ) { + moveimage = 't/right'; + } else { + moveimage = 't/left'; + } var newicon = Y.Node.create('') .addClass(CSS.GENERICICONCLASS) .setAttrs({ - 'src' : M.util.image_url('t/left', 'moodle'), + 'src' : M.util.image_url(moveimage, 'moodle'), 'alt' : left_string }); var moveright = target.one(CSS.MOVERIGHT); -- 1.7.9.5 From c4b521116facb89fa119f226cdf70ca03f55cad3 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Tue, 16 Oct 2012 10:19:31 +0200 Subject: [PATCH 873/903] MDL-36069 - Right align TEXTAREA "Format selector" listbox, when in RTL mode (theme/standard) --- theme/base/style/core.css | 1 - 1 file changed, 1 deletion(-) diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 8748930..c19030e 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -667,7 +667,6 @@ body.tag .managelink {padding: 5px;} .dir-rtl .mod-indent-15, .dir-rtl .mod-indent-huge {margin-right:300px;margin-left:0;} -.dir-rtl .felement.feditor select {margin-right:18.75%;margin-left:auto;} .dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;text-align: right;} .dir-rtl .mform .fitem .felement input[name=email], .dir-rtl .mform .fitem .felement input[name=email2], -- 1.7.9.5 From 561bd396c19239917af65f2415b893dbd3d92209 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 4 Oct 2012 16:20:43 +1300 Subject: [PATCH 874/903] MDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle. --- mod/forum/lib.php | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 7cfb638..5c55e0d 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -8032,29 +8032,37 @@ function forum_get_courses_user_posted_in($user, $discussionsonly = false, $incl function forum_get_forums_user_posted_in($user, array $courseids = null, $discussionsonly = false, $limitfrom = null, $limitnum = null) { global $DB; - $where = array("m.name = 'forum'"); - $params = array(); if (!is_null($courseids)) { list($coursewhere, $params) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'courseid'); - $where[] = 'f.course '.$coursewhere; - } - if (!$discussionsonly) { - $joinsql = 'JOIN {forum_discussions} fd ON fd.forum = f.id - JOIN {forum_posts} fp ON fp.discussion = fd.id'; - $where[] = 'fp.userid = :userid'; + $coursewhere = ' AND f.course '.$coursewhere; } else { - $joinsql = 'JOIN {forum_discussions} fd ON fd.forum = f.id'; - $where[] = 'fd.userid = :userid'; + $coursewhere = ''; + $params = array(); } $params['userid'] = $user->id; - $wheresql = join(' AND ', $where); + $params['forum'] = 'forum'; - $sql = "SELECT DISTINCT f.*, cm.id AS cmid - FROM {forum} f - JOIN {course_modules} cm ON cm.instance = f.id - JOIN {modules} m ON m.id = cm.module - $joinsql - WHERE $wheresql"; + if ($discussionsonly) { + $join = 'JOIN {forum_discussions} ff ON ff.forum = f.id'; + } else { + $join = 'JOIN {forum_discussions} fd ON fd.forum = f.id + JOIN {forum_posts} ff ON ff.discussion = fd.id'; + } + + $sql = "SELECT f.*, cm.id AS cmid + FROM {forum} f + JOIN {course_modules} cm ON cm.instance = f.id + JOIN {modules} m ON m.id = cm.module + JOIN ( + SELECT f.id + FROM {forum} f + {$join} + WHERE ff.userid = :userid + GROUP BY f.id + ) j ON j.id = f.id + WHERE m.name = :forum + {$coursewhere}"; + $courseforums = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum); return $courseforums; } @@ -8309,8 +8317,10 @@ function forum_get_posts_by_user($user, array $courses, $musthaveaccess = false, $forumsearchwhere[] = "(d.forum $fullidsql)"; } - // Prepare SQL to both count and search - $userfields = user_picture::fields('u', null, 'userid'); + // Prepare SQL to both count and search. + // We alias user.id to useridx because we forum_posts already has a userid field and not aliasing this would break + // oracle and mssql. + $userfields = user_picture::fields('u', null, 'useridx'); $countsql = 'SELECT COUNT(*) '; $selectsql = 'SELECT p.*, d.forum, d.name AS discussionname, '.$userfields.' '; $wheresql = implode(" OR ", $forumsearchwhere); -- 1.7.9.5 From 4aaac325f204100c3dbbfd60cde436acd794afd9 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Fri, 2 Nov 2012 15:32:36 +0800 Subject: [PATCH 875/903] MDL-35349 paypal: Fixing return page so that it now declares page context --- enrol/paypal/return.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/enrol/paypal/return.php b/enrol/paypal/return.php index a8a6557..d65b83d 100644 --- a/enrol/paypal/return.php +++ b/enrol/paypal/return.php @@ -35,10 +35,11 @@ if (!$course = $DB->get_record("course", array("id"=>$id))) { } $context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST); +$PAGE->set_context($context); require_login(); -if ($SESSION->wantsurl) { +if (!empty($SESSION->wantsurl)) { $destination = $SESSION->wantsurl; unset($SESSION->wantsurl); } else { -- 1.7.9.5 From 917cea604caf663ea6e796e732e01b63a7cfe133 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Sat, 3 Nov 2012 18:36:13 +1100 Subject: [PATCH 876/903] MDL-36347 quiz: formchangechecker should not obstruct auto-submit. When the quiz time limit runs out, the quiz should be submitted automatically, withouth formchangechecker popping up a dialogue. --- mod/quiz/module.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/quiz/module.js b/mod/quiz/module.js index ce0d359..70332fa 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -101,6 +101,7 @@ M.mod_quiz.timer = { if (form.one('input[name=finishattempt]')) { form.one('input[name=finishattempt]').set('value', 0); } + M.core_formchangechecker.set_form_submitted(); form.submit(); return; } -- 1.7.9.5 From f9e009a744a642f2a4908169a3b4474517e19145 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 5 Nov 2012 16:29:28 +1300 Subject: [PATCH 877/903] MDL-21625 question: Fixed phpdocs --- question/editlib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/question/editlib.php b/question/editlib.php index e4f811e..5b9c894 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -317,8 +317,8 @@ abstract class question_bank_column_base { /** * Output the closing column tag * - * @param type $question - * @param type $rowclasses + * @param object $question + * @param string $rowclasses */ protected function display_end($question, $rowclasses) { $tag = 'td'; -- 1.7.9.5 From a7e956b40350f2afe91f7ec00ad9dd6972cc13b6 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Mon, 5 Nov 2012 13:27:35 +0800 Subject: [PATCH 878/903] MDL-34527 - fix trailing whitespace --- mod/forum/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 5c55e0d..a706571 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -8062,7 +8062,7 @@ function forum_get_forums_user_posted_in($user, array $courseids = null, $discus ) j ON j.id = f.id WHERE m.name = :forum {$coursewhere}"; - + $courseforums = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum); return $courseforums; } -- 1.7.9.5 From 89fbf2e874d01c4912e624bc69895fff9282ef81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 15 Sep 2012 20:54:40 +0200 Subject: [PATCH 879/903] MDL-35381 limit teachers to do permissions checks of enrolled users only --- admin/roles/check.php | 15 ++---- admin/roles/lib.php | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 10 deletions(-) diff --git a/admin/roles/check.php b/admin/roles/check.php index 470159e..d3917b0 100644 --- a/admin/roles/check.php +++ b/admin/roles/check.php @@ -59,16 +59,11 @@ $courseid = $course->id; $contextname = print_context_name($context); // Get the user_selector we will need. -// Teachers within a course just get to see the same list of people they can -// assign roles to. Admins (people with moodle/role:manage) can run this report for any user. -$options = array('context' => $context, 'roleid' => 0); -if (has_capability('moodle/role:manage', $context)) { - $userselector = new potential_assignees_course_and_above('reportuser', $options); -} else { - $userselector = roles_get_potential_user_selector($context, 'reportuser', $options); -} -$userselector->set_multiselect(false); -$userselector->set_rows(10); +// Teachers within a course just get to see the same list of enrolled users. +// Admins (people with moodle/role:manage) can run this report for any user. +$options = array('accesscontext' => $context); +$userselector = new role_check_users_selector('reportuser', $options); +$userselector->set_rows(20); // Work out an appropriate page title. $title = get_string('checkpermissionsin', 'role', $contextname); diff --git a/admin/roles/lib.php b/admin/roles/lib.php index 93703c8..c201d35 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -1077,6 +1077,134 @@ class potential_assignees_below_course extends role_assign_user_selector_base { } /** + * User selector subclass for the selection of users in the check permissions page. + * + * @copyright 2012 Petr Skoda {@link http://skodak.org} + */ +class role_check_users_selector extends user_selector_base { + const MAX_ENROLLED_PER_PAGE = 100; + const MAX_POTENTIAL_PER_PAGE = 100; + + /** @var bool limit listing of users to enrolled only */ + var $onlyenrolled; + + /** + * Constructor. + * + * @param string $name the control name/id for use in the HTML. + * @param array $options other options needed to construct this selector. + * You must be able to clone a userselector by doing new get_class($us)($us->get_name(), $us->get_options()); + */ + public function __construct($name, $options) { + if (!isset($options['multiselect'])) { + $options['multiselect'] = false; + } + parent::__construct($name, $options); + + $coursecontext = $this->accesscontext->get_course_context(false); + if ($coursecontext and $coursecontext->id != SITEID and !has_capability('moodle/role:manage', $coursecontext)) { + // Prevent normal teachers from looking up all users. + $this->onlyenrolled = true; + } else { + $this->onlyenrolled = false; + } + } + + public function find_users($search) { + global $DB; + + list($wherecondition, $params) = $this->search_sql($search, 'u'); + + $fields = 'SELECT ' . $this->required_fields_sql('u'); + $countfields = 'SELECT COUNT(1)'; + + $coursecontext = $this->accesscontext->get_course_context(false); + + if ($coursecontext and $coursecontext != SITEID) { + $sql1 = " FROM {user} u + JOIN {user_enrolments} ue ON (ue.userid = u.id) + JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1) + WHERE $wherecondition"; + $params['courseid1'] = $coursecontext->instanceid; + + if ($this->onlyenrolled) { + $sql2 = null; + } else { + $sql2 = " FROM {user} u + LEFT JOIN ({user_enrolments} ue + JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid2)) ON (ue.userid = u.id) + WHERE $wherecondition + AND ue.id IS NULL"; + $params['courseid2'] = $coursecontext->instanceid; + } + + } else { + if ($this->onlyenrolled) { + // Bad luck, current user may not view only enrolled users. + return array(); + } + $sql1 = null; + $sql2 = " FROM {user} u + WHERE $wherecondition"; + } + + $order = " ORDER BY lastname ASC, firstname ASC"; + + $params['contextid'] = $this->accesscontext->id; + + $result = array(); + + if ($search) { + $groupname1 = get_string('enrolledusersmatching', 'enrol', $search); + $groupname2 = get_string('potusersmatching', 'role', $search); + } else { + $groupname1 = get_string('enrolledusers', 'enrol'); + $groupname2 = get_string('potusers', 'role'); + } + + if ($sql1) { + $enrolleduserscount = $DB->count_records_sql($countfields . $sql1, $params); + if (!$this->is_validating() and $enrolleduserscount > $this::MAX_ENROLLED_PER_PAGE) { + $result[$groupname1] = array(); + $toomany = $this->too_many_results($search, $enrolleduserscount); + $result[implode(' - ', array_keys($toomany))] = array(); + + } else { + $enrolledusers = $DB->get_records_sql($fields . $sql1 . $order, $params); + if ($enrolledusers) { + $result[$groupname1] = $enrolledusers; + } + } + if ($sql2) { + $result[''] = array(); + } + } + if ($sql2) { + $otheruserscount = $DB->count_records_sql($countfields . $sql2, $params); + if (!$this->is_validating() and $otheruserscount > $this::MAX_POTENTIAL_PER_PAGE) { + $result[$groupname2] = array(); + $toomany = $this->too_many_results($search, $otheruserscount); + $result[implode(' - ', array_keys($toomany))] = array(); + } else { + $otherusers = $DB->get_records_sql($fields . $sql2 . $order, $params); + if ($otherusers) { + $result[$groupname2] = $otherusers; + } + } + } + + return $result; + } + + protected function get_options() { + global $CFG; + $options = parent::get_options(); + $options['file'] = $CFG->admin . '/roles/lib.php'; + return $options; + } +} + +/** * User selector subclass for the list of potential users on the assign roles page, * when we are assigning in a context at or above the course level. In this case we * show all the users in the system who do not already have the role. -- 1.7.9.5 From e3ac1261618842be3465551cf4960cd5b5e31fd6 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Tue, 6 Nov 2012 14:01:14 +1300 Subject: [PATCH 880/903] MDL-36379 user_view: fixed issue with page layout when editing was on --- user/view.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user/view.php b/user/view.php index 68d36ac..83792d4 100644 --- a/user/view.php +++ b/user/view.php @@ -148,9 +148,12 @@ if ($currentuser) { } } +$PAGE->set_title("$course->fullname: $strpersonalprofile: $fullname"); +$PAGE->set_heading($course->fullname); +$PAGE->set_pagelayout('standard'); -/// We've established they can see the user's name at least, so what about the rest? - +// Locate the users settings in the settings navigation and force it open. +// This MUST be done after we've set up the page as it is going to cause theme and output to initialise. if (!$currentuser) { $PAGE->navigation->extend_for_user($user); if ($node = $PAGE->settingsnav->get('userviewingsettings'.$user->id)) { @@ -163,9 +166,6 @@ if ($node = $PAGE->settingsnav->get('courseadmin')) { $node->forceopen = false; } -$PAGE->set_title("$course->fullname: $strpersonalprofile: $fullname"); -$PAGE->set_heading($course->fullname); -$PAGE->set_pagelayout('standard'); echo $OUTPUT->header(); echo '
      '; -- 1.7.9.5 From c43e6006e7a873569746514bac9cacb0bc0d4d1b Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Tue, 6 Nov 2012 14:36:29 +1300 Subject: [PATCH 881/903] MDL-36346 - YUI2 SWF vulnerability --- lib/yui/2.9.0/build/charts/assets/charts.swf | Bin 81764 -> 81321 bytes lib/yui/2.9.0/build/uploader/assets/uploader.swf | Bin 7175 -> 7117 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/yui/2.9.0/build/charts/assets/charts.swf b/lib/yui/2.9.0/build/charts/assets/charts.swf index 740b53126e7947751023b3b53b76d7f527e0d3f8..2dfc91874f7d8b7dcd903bc3623a20c3c587e972 100644 GIT binary patch literal 81321 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�aw4k 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 diff --git a/lib/yui/2.9.0/build/uploader/assets/uploader.swf b/lib/yui/2.9.0/build/uploader/assets/uploader.swf index 389505d974021086c6a10822ede37b1cce60c2e6..dbf1fc78f2f1995ed139b974aeb31163953082ee 100644 GIT binary patch literal 7117 zcmV;;8#3fWS5phHFaQ8}+NC-NbQ{N&^LG~*V8H@{5=C{$qC|;;K#H`=l2*d<`0Fu+0-o!o^{;@IhN9H%>Boa(s8>2a##^s=BL>C*0!T<%iuk}D~f za=QO#7a%A*PTo5`&d&ccfByXWZT`SM%ak86*6<$2T7mU9tz?Y7p!uu7*uFy2=o#%F z2%gPma>X9Ru4_-3=5$YI=giDZcxGofUzqCLv3Kv@&aUpx?(XeKvAsB(GqtnZbH$DA z`vrr3y_hJZr_FRe7bIMZ=S${w?d=ZNWTMJ+x>U#rmdQk?p3$><&MbEB2=72f$wZHl zFJv`yzcxLcNhdU7*Lik(F_ll8p3%CxNu)mZ$oy*VI zTP%(eO`@P{W_~F}WsK%CT5hVOP3ik1BVw+K3mG+2-#?~L2Y2iU1-rX;blYOk=)TS? zwC#+b0r#_h|4-$8tWUap`SQ)Gj23odQ(Q;KnE3boAITrxix&T~Ix(HeYe~JpKD}%< z%ovU_qo8H=9n8D-jt9;>tI^)qBySA;q_oikm%g@QKA59ae3UCYUbBIBNcbVkQhY3h-Dsi+Ie`lE&X zR6#Em1?KI?Spn4zMk9qnzF-sGpwGthS|KSgbs(Q8IrR3{Io+%$-lMvq7xY|0S0_e? zNA>5H^rBghHV)5fseC>>TS}`ZCI)+x+O(+`++)*)w5hi)neSPg_d3ox*xz!ic19Z$ z1`xX*)^f>=UQkcr(&>DT4X2AH zO_0_JRtX;Lw}-{aOJ+J#RQuBj@>{JiTW?eJe2#2OHqDmDs} z+S;4KV=S-WM`{n^ju-MXMI8mo=Ff;Bx1Q7D8J(kjsjp99>=bB%PU$Y$Ix0D*(Tlp* zhLN>9p`kJ|jb=g1p>NQs`!NyK*WeS=%{AC)K9h-_(F=hq$4aKZW~dMI>S<@oF;gp; z4K`efTL&fQ%IKyZSc;OP)Hy>!K8KU=;=rPT$1vCurk-5B#L$(|2HRr2#e>2GjkYC3 z5}^|`)Z!(xc3P;Q21gZCc#SWfu|6f@0J99y`>NQ)v@;_z&S0*g1|v1us9-GA)QWdW z0(G+J2zG`n`ke{;Ko|`i!;h#MFh`Y;VZnB#I*0B?8f~B}uO^YDi;?WKIcw)$6_dgd zq{LuvARp5UeRy3=JoWN86P|n zQOtB!cOM@d>5m?F&!lt7{ESPa758XlZ1CoYAB7i*hn!N+p#jEdb}XThGLpJyBzkJB zuXi}&Emnq9LD8E@Pvt!0(W9q^BLm|ujnD??_Be~$%4wOVhyx5#jxe-@9>{8iVhU4H zU=~NU1u2V%cV^dN$w33}d?QzdczK}d#(59QJskgUe<|*|lw7ExfFigH= z6NEgF^b7#wsQHA@`~KKwDu3s zU=Z(;YR(N}c;@oh<+IsRj!G3hIFmM0!Nt^#b9m;Q8FmRK%{FH(K@O3Qr!#4Dc13S3 zh9Nku7tFL?RC0Kk`_Nw!I;JHIpN3qXjytTy^$dE;3hkNKsdm~QM1N2*6p#reFAoYn zHe(DXH#h~;VzJaawzIRlt7~^>yoCOp&MjL~EA-fjv~B6&k^-U+�x*XVxzz66VI_ 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¾(DB@qf4R7l5bxOR9!sJ5QpKI^#z)qTt9Oru-NMky#l9 z*~ETg3-VXM6zsy}u#J@W>~6o}Br7ObH|2LedzjfnJvEfSU83CaLdsqV&$#NEzG*w( zPM74X|6WbCy(sFy1HA&Uj9us`T}nG6PqHy|q;^*)`4QqZg~qO>GDgsmdtIYOw>`nB z7Bo;i%o~NoN=%%f{bA>}O#79X#IIgh}19uO2PVrlASf) zP#yV@GqQ)aYoU?HU$A~J&HX|oS{JRcwWMRaKo1?jAb8Kka0Dhb-eJ2OPAF zJ_n3g#*Gd*Vi^Y<@D|JHC-8S>#+9O}QUi%hnGz;EcOS<`?nbMpon7*GV0HI}I zf9s&ozoHuY@fln+{s}@Kk+7D$NOAwCPTVgqy{wln;5zLWa3SQwZft*$^4+*c+wSprI5J)g z{SqJRN09r+rMMFMgcNs$9+2YhDHk5Dj5p}tkozclemSNZ|Bmnx0aFaJj4=WGjQ>D5 zD&XhA_)kP`6$pi;3j7@~{;P_(jQ>XXs0d(N7t6R4y|IhfToujw2r<$I)as{`%S@Ed86Qb~N zP5VduY{8G&LRtF_#Fa(uxA>jD0wY&2#rQgv2<{8#65K9suuj4f1C5PIRorzU?xHN> zY3Su{QQUA3RtxAh2PFHKfO6<75?*^3UHg!XkU~)K@qmOW*kLNP`z!a>*i53L%YRiW zN8c%aV>w8_`*m9Q#$WpX}}UXeZ@1X Date: Tue, 30 Oct 2012 12:00:03 +0100 Subject: [PATCH 882/903] MDL-36266 Improve update notification message subject --- lang/en/admin.php | 2 +- lib/pluginlib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/en/admin.php b/lang/en/admin.php index 919a7a9..5f47b26 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -997,7 +997,7 @@ $string['updateavailable_version'] = 'Version {$a}'; $string['updateavailablenot'] = 'Your Moodle code is up-to-date!'; $string['updatenotifications'] = 'Update notifications'; $string['updatenotificationfooter'] = 'Your Moodle site {$a->siteurl} is configured to automatically check for available updates. You are receiving this message as the administrator of the site. You can disable automatic checks for available updates in the Site administration section of the Settings block. You can customize the delivery of this message via your personal Messaging setting in the My profile settings section.'; -$string['updatenotificationsubject'] = 'There are available updates for your Moodle site'; +$string['updatenotificationsubject'] = 'Moodle updates are available ({$a->siteurl})'; $string['updateautocheck'] = 'Automatically check for available updates'; $string['updateautocheck_desc'] = 'If enabled, your site will automatically check for available updates for both Moodle code and all additional plugins. If there is a new update available, a notification will be sent to site admins.'; $string['updateminmaturity'] = 'Required code maturity'; diff --git a/lib/pluginlib.php b/lib/pluginlib.php index 470fa88..5c8417e 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -1302,7 +1302,7 @@ class available_update_checker { $message->name = 'availableupdate'; $message->userfrom = $mainadmin; $message->userto = $admin; - $message->subject = get_string('updatenotifications', 'core_admin'); + $message->subject = get_string('updatenotificationsubject', 'core_admin', array('siteurl' => $CFG->wwwroot)); $message->fullmessage = $text; $message->fullmessageformat = FORMAT_PLAIN; $message->fullmessagehtml = $html; -- 1.7.9.5 From 3a8714c3c62ceddbe5ede0e97c212c50d0b951bc Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Tue, 6 Nov 2012 10:16:28 +0000 Subject: [PATCH 883/903] MDL-36023 AJAX Fix reference to chooserdiaogue jumplink --- course/yui/modchooser/modchooser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/course/yui/modchooser/modchooser.js b/course/yui/modchooser/modchooser.js index f87a5ec..28b9081 100644 --- a/course/yui/modchooser/modchooser.js +++ b/course/yui/modchooser/modchooser.js @@ -28,8 +28,6 @@ YUI.add('moodle-course-modchooser', function(Y) { }; this.setup_chooser_dialogue(dialogue, header, params); - this.jumplink = this.container.one('#jump'); - // Initialize existing sections and register for dynamically created sections this.setup_for_section(); M.course.coursebase.register_module(this); -- 1.7.9.5 From 84fad57f1cd011983c1f3a1aa3fef84874df1535 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 9 Oct 2012 11:22:54 +0800 Subject: [PATCH 884/903] MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report --- grade/report/user/lib.php | 12 ++++--- lib/modinfolib.php | 79 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index cd2e951..1058c07 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -348,13 +348,17 @@ class grade_report_user extends grade_report { ($this->showhiddenitems == GRADE_REPORT_USER_HIDE_UNTIL && !$grade_grade->is_hiddenuntil()))) { $hide = true; } else if (!empty($grade_object->itemmodule) && !empty($grade_object->iteminstance)) { - // The grade object can be marked visible but still be hidden if "enablegroupmembersonly" - // is on and it's an activity assigned to a grouping the user is not in. + // The grade object can be marked visible but still be hidden if... + // 1) "enablegroupmembersonly" is on and the activity is assigned to a grouping the user is not in. + // 2) the student cannot see the activity due to conditional access and its set to be hidden entirely. $instances = $this->gtree->modinfo->get_instances_of($grade_object->itemmodule); if (!empty($instances[$grade_object->iteminstance])) { $cm = $instances[$grade_object->iteminstance]; - if ($cm->is_user_access_restricted_by_group()) { - $hide = true; + if (!$cm->uservisible) { + // Further checks are required to determine whether the activity is entirely hidden or just greyed out. + if ($cm->is_user_access_restricted_by_group() || $cm->is_user_access_restricted_by_conditional_access()) { + $hide = true; + } } } } diff --git a/lib/modinfolib.php b/lib/modinfolib.php index c787896..5b8d3ef 100644 --- a/lib/modinfolib.php +++ b/lib/modinfolib.php @@ -1077,8 +1077,12 @@ class cm_info extends stdClass { } /** - * Works out whether activity is visible *for current user* - if this is false, they - * aren't allowed to access it. + * Works out whether activity is available to the current user + * + * If the activity is unavailable, additional checks are required to determine if its hidden or greyed out + * + * @see is_user_access_restricted_by_group() + * @see is_user_access_restricted_by_conditional_access() * @return void */ private function update_user_visible() { @@ -1086,39 +1090,76 @@ class cm_info extends stdClass { $modcontext = get_context_instance(CONTEXT_MODULE, $this->id); $userid = $this->modinfo->get_user_id(); $this->uservisible = true; - // Check visibility/availability conditions. + + // If the user cannot access the activity set the uservisible flag to false. + // Additional checks are required to determine whether the activity is entirely hidden or just greyed out. if ((!$this->visible or !$this->available) and !has_capability('moodle/course:viewhiddenactivities', $modcontext, $userid)) { - // If the activity is hidden or unavailable, and you don't have viewhiddenactivities, - // set it so that user can't see or access it. + $this->uservisible = false; } - // Check group membership. The grouping option makes the activity - // completely invisible as it does not apply to the user at all. + + // Check group membership. if ($this->is_user_access_restricted_by_group()) { - $this->uservisible = false; - // Ensure activity is completely hidden from user. + + $this->uservisible = false; + // Ensure activity is completely hidden from the user. $this->showavailability = 0; } } /** - * Checks whether the module group settings restrict the user access. - * @return bool true if the user access is restricted + * Checks whether the module's group settings restrict the current user's access + * + * @return bool True if the user access is restricted */ public function is_user_access_restricted_by_group() { global $CFG; + + if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly)) { + $modcontext = context_module::instance($this->id); + $userid = $this->modinfo->get_user_id(); + if (!has_capability('moodle/site:accessallgroups', $modcontext, $userid)) { + // If the activity has 'group members only' and you don't have accessallgroups... + $groups = $this->modinfo->get_groups($this->groupingid); + if (empty($groups)) { + // ...and you don't belong to a group, then set it so you can't see/access it + return true; + } + } + } + return false; + } + + /** + * Checks whether the module's conditional access settings mean that the user cannot see the activity at all + * + * @return bool True if the user cannot see the module. False if the activity is either available or should be greyed out. + */ + public function is_user_access_restricted_by_conditional_access() { + global $CFG, $USER; + + if (empty($CFG->enableavailability)) { + return false; + } + + // If module will always be visible anyway (but greyed out), don't bother checking anything else + if ($this->showavailability == CONDITION_STUDENTVIEW_SHOW) { + return false; + } + + // Can the user see hidden modules? $modcontext = context_module::instance($this->id); $userid = $this->modinfo->get_user_id(); - if (!empty($CFG->enablegroupmembersonly) and !empty($this->groupmembersonly) - and !has_capability('moodle/site:accessallgroups', $modcontext, $userid)) { - // If the activity has 'group members only' and you don't have accessallgroups... - $groups = $this->modinfo->get_groups($this->groupingid); - if (empty($groups)) { - // ...and you don't belong to a group, then set it so you can't see/access it - return true; - } + if (has_capability('moodle/course:viewhiddenactivities', $modcontext, $userid)) { + return false; } + + // Is the module hidden due to unmet conditions? + if (!$this->available) { + return true; + } + return false; } -- 1.7.9.5 From 04678efd111a68c2098760c634b0f2bf6d53e4ad Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 7 Nov 2012 00:36:31 +0000 Subject: [PATCH 885/903] Automatically generated installer lang files --- install/lang/ms/moodle.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/lang/ms/moodle.php b/install/lang/ms/moodle.php index 145ec13..44849c0 100644 --- a/install/lang/ms/moodle.php +++ b/install/lang/ms/moodle.php @@ -33,3 +33,4 @@ defined('MOODLE_INTERNAL') || die(); $string['language'] = 'Bahasa'; $string['next'] = 'Seterusnya'; $string['previous'] = 'Sebelum'; +$string['reload'] = 'Muat semula'; -- 1.7.9.5 From c4851e8085501d5fdb3b32a78356575e3f3d8ade Mon Sep 17 00:00:00 2001 From: Paul Nicholls Date: Wed, 7 Nov 2012 13:45:34 +1300 Subject: [PATCH 886/903] MDL-36346 - YUI2 SWF vulnerability, part 2 --- lib/yui/2.9.0/build/swfstore/swfstore.swf | Bin 4897 -> 4841 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/yui/2.9.0/build/swfstore/swfstore.swf b/lib/yui/2.9.0/build/swfstore/swfstore.swf index a7b838dd95a3320669bb233942b8b21bafb81dc4..9c26ed13788c51ddd4b6d5bca27566289e18155b 100644 GIT binary patch literal 4841 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 P%KvOUjg$WcJEN_slRjcC literal 4897 zcmV++6W;7YS5pcC9{>P&+I?C3e_O?spK~7?T}iejzhXPD8)CN=u=XQlRuf1EnpLK4_spA3$Gpm+rEaoKKS9_lN!T zhyCnl{{!!txsq&$?mEoq%*>fHXU_SabLM`?61PFf=_8~G$Y`LM5OS&RuRzG*T-+F( z8V#u{=~TuV#L+$N3ER#N_Vz9>FZV1T=rMDPz5Ry{9qR2H=p7j7MviW4HDhZl-5G0d z`w$l}s#~#KGHWNzjLODZ)XdxWw6~X}#$y$s*?ca=MaE;jdP-008QbdZ@99TD@z|hY z=F*xyq-C?IWK3h?dRMxwgc-ZAtS#x?MoP01hkG{|*&aJ-r}UxWxEa;eP)c7>530i( z`#HD6!kFV5iVkhMrp9*n#LRSWHfP53G1SRGQGD~}ElflE zS;iB~>6&eBwanlJ@Gxlq(#4NRQc~7LU75=F?F(&_`@=RAWu{I4T4km0p z?Lm&yS}L!HjS4wzD@e|)W^uAiIde>5hnmzgi*~}j=t!|VIX!JI>5TSmki)hdLnr6z zV_GVfPoXc3VG+@6qB|l8-wv8aL>QLqhGoCa`k;YKKRGY}e^_8$ul`^&X znX;`sW`*4>e|H3qB~yIfZOBSv|)>eRgV+?`Yic(PsZv zA^Uy$YRM>)g}H)hJ(Eo9UNchxRYO9vhU5CfdDL_i*D}oXR?}9;4OSfITCf=6984`~ zIm@%~kTtGl;we3cYs<#Os1LC_qNP$%Eq1|DEIku${^jnop+Cw)Iq@TbU*@ zww}{sHX`3)-2VRv*|9l-2l+kNI(Jk~=BDsEEX+)na&*SS9glmYv_D zp27&TbTye_g#Zc0qb+I4lon0t>T)t}CsYKNn$VMr37d%<=)XO?qOPd@2kydOGpDAs z+@hZA@uzPIJDPN2PQf^t#IVzI?ve0`Q+kGnc!ySPWg#ZRE^!m9;rp++TLI%7=s8vXv~Y#!cN)Gp4O_F{&emnYRQ-l}W@s z=*;rz3d^Kin9Re$6T<+*U%aTigxM!fv$zq>AhBE~>Pxm{<8572`r_D1*45V0)79BV zb2@?{ro+ANdFNX=P}&TP408&ne`Ej5`f@Djhk%GMVa&ovM8}Z`#_}N=(-g7aU1}N~J7E zk`y!J`oZavJcO_oV{w*qq8~NZ`F?9tA}bwAtvnAjFE1S9Jg0d$eTHSanp^5i)s|8e z_)Oty{Kxe!P$|~sD(uFYX)MigrJ_>J`3Hu(&uQI{^mQNVneS?aMT}O<_HL@(Zmi}U zFfEPHs5Aze>SWT`*tomts7z$C4czy&)U`~uoM<`O5^g!wQq?%ss5f2)T-x1oRH~9O zE`3r}b&WqzTc;?njW+q*&2>Qk87K%8L<$lGnSzS~rQoK5hYDUQ_$X9SsG)+NinSE# zs8~Vk@l-oer z14=6>dqEjS3*1lZrzy-Rvq+z&aE8L1au$?xupN{KL74~TJSYo5ee+5LSz@%opbd)@ z5)_h31{4#hD@);F3ONcE1)D;i!V-lA>RYD1RqA_$x-L?9l)_^aKBvr}kPEc&^Z4^m zP`!jdPhh)5ypykpnQm|e_*VC z#`ZB#;V(c%M4k9A*gk>n2)=*Av;Kyw1yEG6la&AP^9}^qLNK-$M<^dor2Y_rp2xQ0YKz7~%WY?WQcHad=Jp^RWAduUdy^5Q(x$Y)- zm%~imdr&_z#JYQd>^lOaoe0AOe1dqC2tHA4CBj~)k$`kSGhVb4t>#t&g}(E{Z8t$1 zK7X|BNzjfSW0n;Z&&yEgD@>3=xQEP=%iin7g0Wj0!M;r!#a`9Mu-~hNuy56lVIS1S zvG3F-u-~N}$9|u7ANK9qB=#NJ3GBPHli2Uq!r1T8PGNtWc0cypwJGddv}x>jYBSjH z&}J+2pmw@2-yAt}ycrTr1*54Lz88)$kb&ZHp_WGdINn+i70*baPrW>MqfkuL7mR>$ z);JfLd;5j1T0}}`ajA9>A@g&`=LoW_6^y#@1F#l;kZ{g5?HvAw=Lrgywg{F5w1yW) z#Y96Pd^=-s$yD*Ip@GyZF-g7by@|q%^Tp5t)OHZ!42;NHJwmsAyig47h6>M`770EO zll+LNV0BEYOfo_%hNDm@Mx|?Op*y9eu9zH15(Eq(io)o#HpRTV9Z>+Dsx4w>4RL0vV^qMns4S5wNZTn_vo(*Zwb8#NV zqHu94JdYDz=Ew$TkA`fOBi3-y$6VtnEgEs0sgh8g+i@n;O04Ur$z}OQE3t3-F;0~= zeiY}uW<-ogSchxR+BdHi8~$T`or$Y<$%^Mret0)nH_Dn-yj3>wS}TMNp->EJ*HrY4 zjJ}a@dkx!uu%!EC?+wQ!&faU~y+vp5wV<}97B}|#WxRJgyGbD2K?=dMvn2T7X)-G$ z>VnbW&@9Tk&ar+3_91%!N+?9IF51_NI8`g6q3Rh3QSm^r?XvsT&^+@9uGKN=JQ`3+ zXpq$IL?lFm@y%i*iAd6TD0~6@+xX%`!3)7uFnx7a*x*61*E0vz75e6>6H=+;6fRS) zK?7Uzm0cA|1I{%{F2$2)THTz_9M6!;nd`-f+b|18Z#XLyBZ~2G!RY6t$H*0o0VE@q zVWZw_M*g|b5(HP?L=!QjthJKX_0Y0_YprB0xDr|cHoAE&xN@~%Y`c0TCKu;dqw?`p z2tUGf-6qSPn*YYYJkxcfPY3n##k8P9ds=j88Go*%U2Nb@Qyq$F&|&_f4k<7mH6A;D z5!eR*Uc_kMTHiU+b+fB)e;Oi9Xq`*J3%Y=OpPLoXE<4>QGIA;SID{?(TuDo<4VTJ&SN8<51nC+q8OiOEih zwQf`c^NoK8<3SCs06OT4z}%BYUo;^TWiEpKLq{LS*9rXs5O9+#Seq`AFJg59@&wi= zk$ed&)J5`TtWhF)604M#G_e?~E%X)FLSF%BU9ZLf+c(~h?rUZ^qv+D`L6+%SB$20s z((y&(DSkczu4&DI$99IoMido!8iHSgqfjsoguV)bgToyz(NpuGz#MYDk6RyjFYsRE zz2x{q-eOQ@FbIAfO8PZ38?dQXvT1>VfpKnHC}V_8b6ByX&@Z2nB=8NwW=X=9g^DDc zo_~g)5qgHHCYHy7GiJ_Y9+T?J9_!icv2XCLSA)-EdjYPpeLTd{vg1P;?dWf2kSj9C z-6%nhfsF%AI0kK3h1Z0y!LuNL9bGJv=g`F>`3AaJB+qjfqg!P!*(sy7Ulc3WcC3mO z(ZT#2!#o=01u$NOD_sFr71b*xTi4=?D3V}Q_?rM*L3b5yRk-X#N7_qF8a}`}gRe6C z6pY5eF1(Pl_$>&&25(~RbcWw{hV>}@hlrJiT10*j9{0=az?As-RWxWJQd*1Nd6ok~{rZ2-zt8wP_}`GJe9bMClE{tdVlDDB>P> z8Ts({K;%(%72j!lKjV^rkOc%5%{2515ImaIw$fRNy28FhBial1`~+r!$LR;c$HFJ* zM-0_hxgWpJ{rDR9;}16Z@rM|ybL2-Ds&ix)%dxEDh1v)!!G!FV-JY7i@tBIaoS9+8Ut!nV(^U03#`v-Xy>? z)h{x4DRV>>HtO`*qL#u8xyOYW@&vENH;Tru!T1dXFV%POn)?w1-+|!ofzSUIGsK19 zA7NJ9$gutZ=lc`C&Ze|`n}83Y=0acOjPW~&9DS>cm6A>zeE^Z+w-6g#+wZac0h=HHn Date: Wed, 7 Nov 2012 11:49:56 +0100 Subject: [PATCH 887/903] NOBUG: Trivial whitespace fix to quickly fix ongoing CI status. --- comment/comment.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/comment/comment.js b/comment/comment.js index f137299..37c44d4 100644 --- a/comment/comment.js +++ b/comment/comment.js @@ -309,16 +309,16 @@ bodyContent: '
      "; -- 1.7.9.5 From 9b025da73261e80867458926b3ac22c9d5ce535b Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Wed, 7 Nov 2012 19:50:15 +0100 Subject: [PATCH 889/903] MDL-35558 mod_data: Show only own entries while there are required pending. --- mod/data/lib.php | 16 ++++++++++------ mod/data/view.php | 39 ++++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/mod/data/lib.php b/mod/data/lib.php index 583ea73..d78acc5 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -3514,7 +3514,7 @@ function data_get_recordids($alias, $searcharray, $dataid, $recordids) { * @param int $sort DATA_* * @param stdClass $data Data module object * @param array $recordids An array of record IDs. - * @param string $selectdata Information for the select part of the sql statement. + * @param string $selectdata Information for the where and select part of the sql statement. * @param string $sortorder Additional sort parameters * @return array sqlselect sqlselect['sql'] has the sql string, sqlselect['params'] contains an array of parameters. */ @@ -3559,13 +3559,17 @@ function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $so {user} u '; $groupsql = ' GROUP BY r.id, r.approved, r.timecreated, r.timemodified, r.userid, u.firstname, u.lastname, ' .$sortcontentfull; } - $nestfromsql = 'WHERE c.recordid = r.id - AND r.dataid = :dataid - AND r.userid = u.id'; + + // Default to a standard Where statement if $selectdata is empty. + if ($selectdata == '') { + $selectdata = 'WHERE c.recordid = r.id + AND r.dataid = :dataid + AND r.userid = u.id '; + } // Find the field we are sorting on if ($sort > 0 or data_get_field_from_id($sort, $data)) { - $nestfromsql .= ' AND c.fieldid = :sort'; + $selectdata .= ' AND c.fieldid = :sort'; } // If there are no record IDs then return an sql statment that will return no rows. @@ -3574,7 +3578,7 @@ function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $so } else { list($insql, $inparam) = $DB->get_in_or_equal(array('-1'), SQL_PARAMS_NAMED); } - $nestfromsql .= ' AND c.recordid ' . $insql . $selectdata . $groupsql; + $nestfromsql = $selectdata . ' AND c.recordid ' . $insql . $groupsql; $sqlselect['sql'] = "$nestselectsql $nestfromsql $sortorder"; $sqlselect['params'] = $inparam; return $sqlselect; diff --git a/mod/data/view.php b/mod/data/view.php index 1b2d85b..0b76db0 100644 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -456,11 +456,15 @@ if ($showactivity) { $requiredentries_allowed = false; } + // Initialise the first group of params for advanced searches. + $initialparams = array(); + /// setup group and approve restrictions if (!$approvecap && $data->approval) { if (isloggedin()) { $approveselect = ' AND (r.approved=1 OR r.userid=:myid1) '; $params['myid1'] = $USER->id; + $initialparams['myid1'] = $params['myid1']; } else { $approveselect = ' AND r.approved=1 '; } @@ -471,6 +475,7 @@ if ($showactivity) { if ($currentgroup) { $groupselect = " AND (r.groupid = :currentgroup OR r.groupid = 0)"; $params['currentgroup'] = $currentgroup; + $initialparams['currentgroup'] = $params['currentgroup']; } else { if ($canviewallrecords) { $groupselect = ' '; @@ -486,6 +491,8 @@ if ($showactivity) { $advwhere = ''; $advtables = ''; $advparams = array(); + // This is used for the initial reduction of advanced search results with required entries. + $entrysql = ''; /// Find the field we are sorting on if ($sort <= 0 or !$sortfield = data_get_field_from_id($sort, $data)) { @@ -514,8 +521,7 @@ if ($showactivity) { $tables = '{data_content} c,{data_records} r, {data_content} cs, {user} u '; $where = 'WHERE c.recordid = r.id AND r.dataid = :dataid - AND r.userid = u.id - AND cs.recordid = r.id '; + AND r.userid = u.id '; $params['dataid'] = $data->id; $sortorder = ' ORDER BY '.$ordering.', r.id ASC '; $searchselect = ''; @@ -523,7 +529,9 @@ if ($showactivity) { // If requiredentries is not reached, only show current user's entries if (!$requiredentries_allowed) { $where .= ' AND u.id = :myid2 '; + $entrysql = ' AND r.userid = :myid3 '; $params['myid2'] = $USER->id; + $initialparams['myid3'] = $params['myid2']; } if (!empty($advanced)) { //If advanced box is checked. @@ -541,6 +549,7 @@ if ($showactivity) { $advparams = array_merge($advparams, $val->params); } } else if ($search) { + $where .= ' AND cs.recordid = r.id '; $searchselect = " AND (".$DB->sql_like('cs.content', ':search1', false)." OR ".$DB->sql_like('u.firstname', ':search2', false)." OR ".$DB->sql_like('u.lastname', ':search3', false)." ) "; $params['search1'] = "%$search%"; $params['search2'] = "%$search%"; @@ -558,10 +567,11 @@ if ($showactivity) { $count = ' COUNT(DISTINCT c.recordid) '; $tables = '{data_content} c, {data_records} r, {data_content} cs, {user} u '; $where = 'WHERE c.recordid = r.id - AND c.fieldid = :sort AND r.dataid = :dataid - AND r.userid = u.id - AND cs.recordid = r.id '; + AND r.userid = u.id '; + if (!$advanced) { + $where .= 'AND c.fieldid = :sort'; + } $params['dataid'] = $data->id; $params['sort'] = $sort; $sortorder = ' ORDER BY sortorder '.$order.' , r.id ASC '; @@ -569,8 +579,10 @@ if ($showactivity) { // If requiredentries is not reached, only show current user's entries if (!$requiredentries_allowed) { - $where .= ' AND u.id = ' . $USER->id; + $where .= ' AND u.id = :myid2'; + $entrysql = ' AND r.userid = :myid3'; $params['myid2'] = $USER->id; + $initialparams['myid3'] = $params['myid2']; } $i = 0; if (!empty($advanced)) { //If advanced box is checked. @@ -587,6 +599,7 @@ if ($showactivity) { $advparams = array_merge($advparams, $val->params); } } else if ($search) { + $where .= ' AND cs.recordid = r.id '; $searchselect = " AND (".$DB->sql_like('cs.content', ':search1', false)." OR ".$DB->sql_like('u.firstname', ':search2', false)." OR ".$DB->sql_like('u.lastname', ':search3', false)." ) "; $params['search1'] = "%$search%"; $params['search2'] = "%$search%"; @@ -599,23 +612,15 @@ if ($showactivity) { /// To actually fetch the records $fromsql = "FROM $tables $advtables $where $advwhere $groupselect $approveselect $searchselect $advsearchselect"; - $sqlcount = "SELECT $count $fromsql"; // Total number of records when searching - $sqlmax = "SELECT $count FROM $tables $where $groupselect $approveselect"; // number of all recoirds user may see $allparams = array_merge($params, $advparams); // Provide initial sql statements and parameters to reduce the number of total records. - $selectdata = $groupselect . $approveselect; - $initialparams = array(); - if ($currentgroup) { - $initialparams['currentgroup'] = $params['currentgroup']; - } - if (!$approvecap && $data->approval && isloggedin()) { - $initialparams['myid1'] = $params['myid1']; - } + $initialselect = $groupselect . $approveselect . $entrysql; - $recordids = data_get_all_recordids($data->id, $selectdata, $initialparams); + $recordids = data_get_all_recordids($data->id, $initialselect, $initialparams); $newrecordids = data_get_advance_search_ids($recordids, $search_array, $data->id); $totalcount = count($newrecordids); + $selectdata = $where . $groupselect . $approveselect; if (!empty($advanced)) { $advancedsearchsql = data_get_advanced_search_sql($sort, $data, $newrecordids, $selectdata, $sortorder); -- 1.7.9.5 From a5b62b8f313a60c3b80666cce2cc37f3fad11583 Mon Sep 17 00:00:00 2001 From: Nadav Kavalerchik Date: Sat, 29 Sep 2012 16:09:51 +0200 Subject: [PATCH 890/903] MDL-35249 - Move Grading popmenu "userid" column after "scale" column (workaround) Conflicts: mod/assign/gradingtable.php --- mod/assign/gradingtable.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index fce13ea..29be4ee 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -121,10 +121,6 @@ class assign_grading_table extends table_sql implements renderable { if (!$this->is_downloading()) { $columns[] = 'select'; $headers[] = get_string('select') . '
      '; - - // We have to call this column userid so we can use userid as a default sortable column. - $columns[] = 'userid'; - $headers[] = get_string('edit'); } // User picture @@ -145,6 +141,11 @@ class assign_grading_table extends table_sql implements renderable { // Grade $columns[] = 'grade'; $headers[] = get_string('grade'); + if (!$this->is_downloading()) { + // We have to call this column userid so we can use userid as a default sortable column. + $columns[] = 'userid'; + $headers[] = get_string('edit'); + } // Submission plugins if ($assignment->is_any_submission_plugin_enabled()) { -- 1.7.9.5 From 845cfc33898922d94aa5aec1969d5a4f90ad8e64 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Fri, 26 Oct 2012 01:18:17 +0100 Subject: [PATCH 891/903] MDL-36197 theme_fusion: Fix for "Your progress" overlaps completion tracking checkbox --- theme/fusion/style/core.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/theme/fusion/style/core.css b/theme/fusion/style/core.css index bc31d35..7e94997 100644 --- a/theme/fusion/style/core.css +++ b/theme/fusion/style/core.css @@ -390,3 +390,8 @@ h2.headingblock { #page-mod-assignment-submissions #attempts th.header { font-size: 80%; } + +.course-content ul.topics, +.course-content ul.weeks { + clear: both; +} \ No newline at end of file -- 1.7.9.5 From d8e550e4ac5b3847cf34b3e3e7dc02d894c964ce Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 7 Nov 2012 16:39:01 +0800 Subject: [PATCH 892/903] MDL-33791 Portfolio: Fixed security issue with passing file paths. --- lib/portfoliolib.php | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ portfolio/add.php | 11 +++----- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php index 8405102..be531b1 100644 --- a/lib/portfoliolib.php +++ b/lib/portfoliolib.php @@ -1271,6 +1271,74 @@ function portfolio_rewrite_pluginfile_url_callback($contextid, $component, $file return $format->file_output($file, $options); } +/** +* Function to require any potential callback files, throwing exceptions +* if an issue occurs. +* +* @param string $callbackfile This is the location of the callback file '/mod/forum/locallib.php' +* @param string $class Name of the class containing the callback functions +* activity components should ALWAYS use their name_portfolio_caller +* other locations must use something unique +*/ +function portfolio_include_callback_file($callbackfile, $class = null) { + global $CFG; + require_once($CFG->libdir . '/adminlib.php'); + + // Get the last occurrence of '/' in the file path. + $pos = strrpos($callbackfile, '/'); + // Get rid of the first slash (if it exists). + $callbackfile = ltrim($callbackfile, '/'); + // Get a list of valid plugin types. + $plugintypes = get_plugin_types(false); + // Assume it is not valid for now. + $isvalid = false; + // Go through the plugin types. + foreach ($plugintypes as $type => $path) { + if (strrpos($callbackfile, $path) === 0) { + // Found the plugin type. + $isvalid = true; + $plugintype = $type; + $pluginpath = $path; + } + } + // Throw exception if not a valid component. + if (!$isvalid) { + throw new coding_exception('Somehow a non-valid plugin path was passed, could be a hackz0r attempt, exiting.'); + } + // Keep record of the filename. + $filename = substr($callbackfile, $pos); + // Remove the file name. + $component = trim(substr($callbackfile, 0, $pos), '/'); + // Replace the path with the type. + $component = str_replace($pluginpath, $plugintype, $component); + // Ok, replace '/' with '_'. + $component = str_replace('/', '_', $component); + // Check that it is a valid component. + if (!get_component_version($component)) { + throw new portfolio_button_exception('nocallbackcomponent', 'portfolio', '', $component); + } + + // Obtain the component's location. + if (!$componentloc = get_component_directory($component)) { + throw new portfolio_button_exception('nocallbackcomponent', 'portfolio', '', $component); + } + + // Check if the filename does not meet any of the expected names. + if (($filename != 'locallib.php') && ($filename != 'portfoliolib.php') && ($filename != 'portfolio_callback.php')) { + debugging('Please standardise your plugin by keeping your portfolio callback functionality in the file locallib.php.', DEBUG_DEVELOPER); + } + + // Throw error if file does not exist. + if (!file_exists($componentloc . '/' . $filename)) { + throw new portfolio_button_exception('nocallbackfile', 'portfolio', '', $callbackfile); + } + + require_once($componentloc . '/' . $filename); + + if (!is_null($class) && !class_exists($class)) { + throw new portfolio_button_exception('nocallbackclass', 'portfolio', '', $class); + } +} /** * Go through all the @@PLUGINFILE@@ matches in some text, diff --git a/portfolio/add.php b/portfolio/add.php index b5a1c4a..cb2aff1 100644 --- a/portfolio/add.php +++ b/portfolio/add.php @@ -173,13 +173,10 @@ if (!empty($dataid)) { $callbackargs[substr($key, 3)] = $value; } } - // righto, now we have the callback args set up - // load up the caller file and class and tell it to set up all the data - // it needs - require_once($CFG->dirroot . $callbackfile); - if (!class_exists($callbackclass) || !is_subclass_of($callbackclass, 'portfolio_caller_base')) { - throw new portfolio_caller_exception('callbackclassinvalid', 'portfolio'); - } + + // Ensure that we found a file we can use, if not throw an exception. + portfolio_include_callback_file($callbackfile, $callbackclass); + $caller = new $callbackclass($callbackargs); $caller->set('user', $USER); if ($formats = explode(',', $callerformats)) { -- 1.7.9.5 From 3bcff380158e81506b210b3004b865fe39cf6917 Mon Sep 17 00:00:00 2001 From: Rex Lorenzo Date: Wed, 7 Nov 2012 16:26:26 -0800 Subject: [PATCH 893/903] MDL-36051 - Quick Grading in Assignment module does not turn on in some circumstances * Fixed bug with quick grading when file submission is turned off --- mod/assign/locallib.php | 4 +++- mod/assign/module.js | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 7238b70..1e24886 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -2760,7 +2760,9 @@ class assign { 'showquickgrading'=>false)); if ($formdata = $mform->get_data()) { set_user_preference('assign_perpage', $formdata->perpage); - set_user_preference('assign_filter', $formdata->filter); + if (isset($formdata->filter)) { + set_user_preference('assign_filter', $formdata->filter); + } } } diff --git a/mod/assign/module.js b/mod/assign/module.js index a1cbe07..ec5e071 100644 --- a/mod/assign/module.js +++ b/mod/assign/module.js @@ -117,9 +117,11 @@ M.mod_assign.init_grading_options = function(Y) { Y.one('form.gradingoptionsform').submit(); }); var filterelement = Y.one('#id_filter'); - filterelement.on('change', function(e) { - Y.one('form.gradingoptionsform').submit(); - }); + if (filterelement) { + filterelement.on('change', function(e) { + Y.one('form.gradingoptionsform').submit(); + }); + } var quickgradingelement = Y.one('#id_quickgrading'); if (quickgradingelement) { quickgradingelement.on('change', function(e) { @@ -139,4 +141,4 @@ M.mod_assign.init_grade_change = function(Y) { } }); } -}; \ No newline at end of file +}; -- 1.7.9.5 From 8a73556f8da98e3779eb4c217dff2ac0baebc297 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 8 Nov 2012 10:20:22 +0800 Subject: [PATCH 894/903] MDL-36422 question: Fixed malformed HTML in manual marking --- question/behaviour/rendererbase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php index e04a638..6a24e38 100644 --- a/question/behaviour/rendererbase.php +++ b/question/behaviour/rendererbase.php @@ -86,7 +86,6 @@ abstract class qbehaviour_renderer extends plugin_renderer_base { $commenteditor = html_writer::tag('div', html_writer::tag('textarea', s($commenttext), array('id' => $id, 'name' => $inputname, 'rows' => 10, 'cols' => 60))); - $commenteditor .= html_writer::end_tag('div'); $editorformat = ''; if (count($formats) == 1) { -- 1.7.9.5 From eabdc81c403d41babcb653b673f352a04750161e Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 30 Aug 2012 12:23:18 +0800 Subject: [PATCH 895/903] MDL-27824 - course category: add check test for ->coursesperpage value. --- course/category.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/course/category.php b/course/category.php index a04e499..7eb71c2 100644 --- a/course/category.php +++ b/course/category.php @@ -31,7 +31,6 @@ require_once($CFG->libdir.'/textlib.class.php'); $id = required_param('id', PARAM_INT); // Category id $page = optional_param('page', 0, PARAM_INT); // which page to show -$perpage = optional_param('perpage', $CFG->coursesperpage, PARAM_INT); // how many per page $categoryedit = optional_param('categoryedit', -1, PARAM_BOOL); $hide = optional_param('hide', 0, PARAM_INT); $show = optional_param('show', 0, PARAM_INT); @@ -41,6 +40,15 @@ $moveto = optional_param('moveto', 0, PARAM_INT); $resort = optional_param('resort', 0, PARAM_BOOL); $sesskey = optional_param('sesskey', '', PARAM_RAW); +// MDL-27824 - This is a temporary fix until we have the proper +// way to check/initialize $CFG value. +if (isset($CFG->coursesperpage)) { + $defaultperpage = $CFG->coursesperpage; +} else { + $defaultperpage = 20; +} +$perpage = optional_param('perpage', $defaultperpage, PARAM_INT); // how many per page + if (empty($id)) { print_error("unknowcategory"); } -- 1.7.9.5 From 74b266a332231797bdd4b154b0404e3c1d2ec194 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Tue, 11 Sep 2012 16:17:22 +0800 Subject: [PATCH 896/903] MDL-27824 course categories: Added @todo comments to remove the temporary fix --- course/category.php | 1 + 1 file changed, 1 insertion(+) diff --git a/course/category.php b/course/category.php index 7eb71c2..e910119 100644 --- a/course/category.php +++ b/course/category.php @@ -42,6 +42,7 @@ $sesskey = optional_param('sesskey', '', PARAM_RAW); // MDL-27824 - This is a temporary fix until we have the proper // way to check/initialize $CFG value. +// @todo MDL-35138 remove this temporary solution if (isset($CFG->coursesperpage)) { $defaultperpage = $CFG->coursesperpage; } else { -- 1.7.9.5 From 9bc298d28751b16663fc135dd31f07aa132fa1d0 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Fri, 12 Oct 2012 15:24:55 +0800 Subject: [PATCH 897/903] MDL-27824 course categories: change isset() to empty() --- course/category.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/category.php b/course/category.php index e910119..6f48269 100644 --- a/course/category.php +++ b/course/category.php @@ -43,7 +43,7 @@ $sesskey = optional_param('sesskey', '', PARAM_RAW); // MDL-27824 - This is a temporary fix until we have the proper // way to check/initialize $CFG value. // @todo MDL-35138 remove this temporary solution -if (isset($CFG->coursesperpage)) { +if (!empty($CFG->coursesperpage)) { $defaultperpage = $CFG->coursesperpage; } else { $defaultperpage = 20; -- 1.7.9.5 From a46405df3a930739e7d641a18c00725e5b792ecc Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 8 Nov 2012 12:29:42 +0800 Subject: [PATCH 898/903] MDL-27824 course categories: remove trailing whitespace --- course/category.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/course/category.php b/course/category.php index 6f48269..cb1d0c7 100644 --- a/course/category.php +++ b/course/category.php @@ -40,7 +40,7 @@ $moveto = optional_param('moveto', 0, PARAM_INT); $resort = optional_param('resort', 0, PARAM_BOOL); $sesskey = optional_param('sesskey', '', PARAM_RAW); -// MDL-27824 - This is a temporary fix until we have the proper +// MDL-27824 - This is a temporary fix until we have the proper // way to check/initialize $CFG value. // @todo MDL-35138 remove this temporary solution if (!empty($CFG->coursesperpage)) { -- 1.7.9.5 From c4d19c8789ba1ac8695553fe2ce6a6e4ae9e1aba Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Fri, 9 Nov 2012 00:38:56 +0000 Subject: [PATCH 899/903] Automatically generated installer lang files --- install/lang/no/error.php | 2 +- install/lang/no/install.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lang/no/error.php b/install/lang/no/error.php index 26b9927..8d39a3c 100644 --- a/install/lang/no/error.php +++ b/install/lang/no/error.php @@ -42,7 +42,7 @@ $string['componentisuptodate'] = 'Komponenten er oppdatert'; $string['downloadedfilecheckfailed'] = 'Sjekk av nedlastet fil mislykkes.'; $string['invalidmd5'] = 'Ugyldig md5, prøv igjen'; $string['missingrequiredfield'] = 'Noen påkrevde felt mangler'; -$string['remotedownloaderror'] = 'Mislykkes i å laste ned komponenten til din server, vennligst sjekk proxy-innstillingene. PHP cURL tillegget er sterkt anbefalt.

      Du må laste ned       {$a->url} filen manuelt, kopiere den til "{$a->dest}" på serveren din og pakke den ut der.'; +$string['remotedownloaderror'] = 'Mislykkes i å laste ned komponenten til din server, vennligst sjekk proxy-innstillingene. PHP cURL-tillegget er sterkt anbefalt.

      Du må laste ned {$a->url} filen manuelt, kopiere den til "{$a->dest}" på serveren din og pakke den ut der.'; $string['wrongdestpath'] = 'Gal målmappe'; $string['wrongsourcebase'] = 'Feil kilde URL base'; $string['wrongzipfilename'] = 'Galt ZIP-filnavn.'; diff --git a/install/lang/no/install.php b/install/lang/no/install.php index bd29cd8..e414a2a 100644 --- a/install/lang/no/install.php +++ b/install/lang/no/install.php @@ -72,7 +72,7 @@ $string['pathssubwwwroot'] = 'Full webadresse til der hvor Moodle skal vises. De Dersom adressen ikke er korrekt, vennligst endre URL i nettleseren slik at at installasjonen restartes med andre verdier.'; $string['pathsunsecuredataroot'] = 'Dataroot plassering er ikke sikker'; $string['pathswrongadmindir'] = 'Adminkatalog finnes ikke'; -$string['phpextension'] = '{$a} PHP etternavn'; +$string['phpextension'] = '{$a} PHP-tillegg'; $string['phpversion'] = 'PHP versjon'; $string['phpversionhelp'] = '

      Moodle trenger en PHP versjon minst 4.3.0 eller 5.1.0 (5.0.x har rekke kjente problem).

      -- 1.7.9.5 From ce44bf44411b2486dcf93756603f0c148ea3771c Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 9 Nov 2012 17:58:34 +0800 Subject: [PATCH 900/903] weekly release 2.3.2+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 083bdd1..1324d61 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.10; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062502.11; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20121101)'; // Human-friendly version name +$release = '2.3.2+ (Build: 20121109)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From ff63a3ad58dd985e27279e3495b0d85b23584a54 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 9 Nov 2012 19:35:55 +0100 Subject: [PATCH 901/903] Moodle release 2.3.3 --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 1324d61..295fdcc 100644 --- a/version.php +++ b/version.php @@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2012062502.11; // YYYYMMDD = weekly release date of this DEV branch +$version = 2012062503.00; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.3.2+ (Build: 20121109)'; // Human-friendly version name +$release = '2.3.3 (Build: 20121112)'; // Human-friendly version name $branch = '23'; // this version's branch $maturity = MATURITY_STABLE; // this version's maturity level -- 1.7.9.5 From 15e90e20fe9410dae1e1dfe2b91690322fff3fef Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Jan 2013 13:59:47 +0100 Subject: [PATCH 902/903] f1 upload --- 0 files changed create mode 100644 f1 diff --git a/f1 b/f1 new file mode 100644 index 0000000..e69de29 -- 1.7.9.5 From 99c707af74243675733be9e7ada8ba266780a5f1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Jan 2013 16:13:03 +0100 Subject: [PATCH 903/903] Subida EvaluateMe --- course/modedit.php | 10 +- mod/feedback/edit.php | 54 +- mod/feedback/import4.php | 922 +++++++++++++++++++++++++++++++++++ mod/feedback/mod_formEvaluateMe.php | 236 +++++++++ mod/feedback/pix/icon.gif | Bin 107 -> 107 bytes mod/feedback/pix/multichoice/0.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/1.gif | Bin 43 -> 43 bytes mod/feedback/pix/multichoice/2.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/3.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/4.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/5.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/6.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/7.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/8.gif | Bin 35 -> 35 bytes mod/feedback/pix/multichoice/9.gif | Bin 35 -> 35 bytes mod/feedback/pix/notrequired.gif | Bin 143 -> 143 bytes mod/feedback/pix/required.gif | Bin 217 -> 217 bytes 17 files changed, 1219 insertions(+), 3 deletions(-) mode change 100644 => 100755 course/category.php mode change 100644 => 100755 course/changenumsections.php mode change 100644 => 100755 course/completion.js mode change 100644 => 100755 course/completion.php mode change 100644 => 100755 course/completion_form.php mode change 100644 => 100755 course/delete.php mode change 100644 => 100755 course/delete_category_form.php mode change 100644 => 100755 course/dndupload.js mode change 100644 => 100755 course/dndupload.php mode change 100644 => 100755 course/dnduploadlib.php mode change 100644 => 100755 course/edit.php mode change 100644 => 100755 course/edit_form.php mode change 100644 => 100755 course/editcategory.php mode change 100644 => 100755 course/editcategory_form.php mode change 100644 => 100755 course/editsection.php mode change 100644 => 100755 course/editsection_form.php mode change 100644 => 100755 course/enrol.php mode change 100644 => 100755 course/externallib.php mode change 100644 => 100755 course/format/README.txt mode change 100644 => 100755 course/format/renderer.php mode change 100644 => 100755 course/format/scorm/config.php mode change 100644 => 100755 course/format/scorm/format.php mode change 100644 => 100755 course/format/scorm/lang/en/format_scorm.php mode change 100644 => 100755 course/format/scorm/lib.php mode change 100644 => 100755 course/format/scorm/version.php mode change 100644 => 100755 course/format/social/config.php mode change 100644 => 100755 course/format/social/format.php mode change 100644 => 100755 course/format/social/lang/en/format_social.php mode change 100644 => 100755 course/format/social/lib.php mode change 100644 => 100755 course/format/social/version.php mode change 100644 => 100755 course/format/topics/config.php mode change 100644 => 100755 course/format/topics/format.js mode change 100644 => 100755 course/format/topics/format.php mode change 100644 => 100755 course/format/topics/lang/en/format_topics.php mode change 100644 => 100755 course/format/topics/lib.php mode change 100644 => 100755 course/format/topics/renderer.php mode change 100644 => 100755 course/format/topics/styles.css mode change 100644 => 100755 course/format/topics/version.php mode change 100644 => 100755 course/format/upgrade.txt mode change 100644 => 100755 course/format/weeks/config.php mode change 100644 => 100755 course/format/weeks/format.js mode change 100644 => 100755 course/format/weeks/format.php mode change 100644 => 100755 course/format/weeks/lang/en/format_weeks.php mode change 100644 => 100755 course/format/weeks/lib.php mode change 100644 => 100755 course/format/weeks/renderer.php mode change 100644 => 100755 course/format/weeks/styles.css mode change 100644 => 100755 course/format/weeks/version.php mode change 100644 => 100755 course/index.php mode change 100644 => 100755 course/info.php mode change 100644 => 100755 course/jumpto.php mode change 100644 => 100755 course/lib.php mode change 100644 => 100755 course/loginas.php mode change 100644 => 100755 course/mod.php mode change 100644 => 100755 course/modduplicate.php mode change 100644 => 100755 course/modedit.php mode change 100644 => 100755 course/moodleform_mod.php mode change 100644 => 100755 course/pending.php mode change 100644 => 100755 course/publish/backup.php mode change 100644 => 100755 course/publish/forms.php mode change 100644 => 100755 course/publish/hubselector.php mode change 100644 => 100755 course/publish/index.php mode change 100644 => 100755 course/publish/lib.php mode change 100644 => 100755 course/publish/metadata.php mode change 100644 => 100755 course/publish/renderer.php mode change 100644 => 100755 course/recent.php mode change 100644 => 100755 course/recent_form.php mode change 100644 => 100755 course/renderer.php mode change 100644 => 100755 course/report.php mode change 100644 => 100755 course/report/lib.php mode change 100644 => 100755 course/request.php mode change 100644 => 100755 course/request_form.php mode change 100644 => 100755 course/reset.php mode change 100644 => 100755 course/reset_form.php mode change 100644 => 100755 course/resources.php mode change 100644 => 100755 course/rest.php mode change 100644 => 100755 course/scales.php mode change 100644 => 100755 course/search.php mode change 100644 => 100755 course/style.css mode change 100644 => 100755 course/switchrole.php mode change 100644 => 100755 course/tests/courselib_test.php mode change 100644 => 100755 course/tests/externallib_test.php mode change 100644 => 100755 course/togglecompletion.php mode change 100644 => 100755 course/user.php mode change 100644 => 100755 course/view.php mode change 100644 => 100755 course/yui/coursebase/coursebase.js mode change 100644 => 100755 course/yui/dragdrop/dragdrop.js mode change 100644 => 100755 course/yui/modchooser/modchooser.js mode change 100644 => 100755 course/yui/toolboxes/toolboxes.js mode change 100644 => 100755 mod/feedback/README.txt mode change 100644 => 100755 mod/feedback/TODO.txt mode change 100644 => 100755 mod/feedback/analysis.php mode change 100644 => 100755 mod/feedback/analysis_course.php mode change 100644 => 100755 mod/feedback/analysis_to_excel.php mode change 100644 => 100755 mod/feedback/backup/moodle1/lib.php mode change 100644 => 100755 mod/feedback/backup/moodle2/backup_feedback_activity_task.class.php mode change 100644 => 100755 mod/feedback/backup/moodle2/backup_feedback_settingslib.php mode change 100644 => 100755 mod/feedback/backup/moodle2/backup_feedback_stepslib.php mode change 100644 => 100755 mod/feedback/backup/moodle2/restore_feedback_activity_task.class.php mode change 100644 => 100755 mod/feedback/backup/moodle2/restore_feedback_stepslib.php mode change 100644 => 100755 mod/feedback/choose_group_form.php mode change 100644 => 100755 mod/feedback/complete.php mode change 100644 => 100755 mod/feedback/complete_guest.php mode change 100644 => 100755 mod/feedback/db/access.php mode change 100644 => 100755 mod/feedback/db/install.php mode change 100644 => 100755 mod/feedback/db/install.xml mode change 100644 => 100755 mod/feedback/db/log.php mode change 100644 => 100755 mod/feedback/db/messages.php mode change 100644 => 100755 mod/feedback/db/upgrade.php mode change 100644 => 100755 mod/feedback/delete_completed.php mode change 100644 => 100755 mod/feedback/delete_completed_form.php mode change 100644 => 100755 mod/feedback/delete_item.php mode change 100644 => 100755 mod/feedback/delete_item_form.php mode change 100644 => 100755 mod/feedback/delete_template.php mode change 100644 => 100755 mod/feedback/delete_template_form.php mode change 100644 => 100755 mod/feedback/edit.php mode change 100644 => 100755 mod/feedback/edit_form.php mode change 100644 => 100755 mod/feedback/edit_item.php mode change 100644 => 100755 mod/feedback/export.php mode change 100644 => 100755 mod/feedback/feedback.js mode change 100644 => 100755 mod/feedback/import.php create mode 100755 mod/feedback/import4.php mode change 100644 => 100755 mod/feedback/import_form.php mode change 100644 => 100755 mod/feedback/index.php mode change 100644 => 100755 mod/feedback/item/captcha/captcha_form.php mode change 100644 => 100755 mod/feedback/item/captcha/lib.php mode change 100644 => 100755 mod/feedback/item/captcha/print_captcha.php mode change 100644 => 100755 mod/feedback/item/feedback_item_class.php mode change 100644 => 100755 mod/feedback/item/feedback_item_form_class.php mode change 100644 => 100755 mod/feedback/item/info/info_form.php mode change 100644 => 100755 mod/feedback/item/info/lib.php mode change 100644 => 100755 mod/feedback/item/label/label_form.php mode change 100644 => 100755 mod/feedback/item/label/lib.php mode change 100644 => 100755 mod/feedback/item/multichoice/lib.php mode change 100644 => 100755 mod/feedback/item/multichoice/multichoice_form.php mode change 100644 => 100755 mod/feedback/item/multichoicerated/lib.php mode change 100644 => 100755 mod/feedback/item/multichoicerated/multichoicerated_form.php mode change 100644 => 100755 mod/feedback/item/numeric/lib.php mode change 100644 => 100755 mod/feedback/item/numeric/numeric_form.php mode change 100644 => 100755 mod/feedback/item/textarea/lib.php mode change 100644 => 100755 mod/feedback/item/textarea/textarea_form.php mode change 100644 => 100755 mod/feedback/item/textfield/lib.php mode change 100644 => 100755 mod/feedback/item/textfield/textfield_form.php mode change 100644 => 100755 mod/feedback/lang/en/feedback.php mode change 100644 => 100755 mod/feedback/lib.php mode change 100644 => 100755 mod/feedback/mapcourse.php mode change 100644 => 100755 mod/feedback/mod_form.php create mode 100755 mod/feedback/mod_formEvaluateMe.php mode change 100644 => 100755 mod/feedback/pix/icon.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/0.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/1.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/2.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/3.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/4.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/5.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/6.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/7.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/8.gif mode change 100644 => 100755 mod/feedback/pix/multichoice/9.gif mode change 100644 => 100755 mod/feedback/pix/notrequired.gif mode change 100644 => 100755 mod/feedback/pix/required.gif mode change 100644 => 100755 mod/feedback/print.php mode change 100644 => 100755 mod/feedback/settings.php mode change 100644 => 100755 mod/feedback/show_entries.php mode change 100644 => 100755 mod/feedback/show_entries_anonym.php mode change 100644 => 100755 mod/feedback/show_nonrespondents.php mode change 100644 => 100755 mod/feedback/styles.css mode change 100644 => 100755 mod/feedback/tabs.php mode change 100644 => 100755 mod/feedback/unmapcourse.php mode change 100644 => 100755 mod/feedback/use_templ.php mode change 100644 => 100755 mod/feedback/use_templ_form.php mode change 100644 => 100755 mod/feedback/version.php mode change 100644 => 100755 mod/feedback/view.php diff --git a/course/category.php b/course/category.php old mode 100644 new mode 100755 diff --git a/course/changenumsections.php b/course/changenumsections.php old mode 100644 new mode 100755 diff --git a/course/completion.js b/course/completion.js old mode 100644 new mode 100755 diff --git a/course/completion.php b/course/completion.php old mode 100644 new mode 100755 diff --git a/course/completion_form.php b/course/completion_form.php old mode 100644 new mode 100755 diff --git a/course/delete.php b/course/delete.php old mode 100644 new mode 100755 diff --git a/course/delete_category_form.php b/course/delete_category_form.php old mode 100644 new mode 100755 diff --git a/course/dndupload.js b/course/dndupload.js old mode 100644 new mode 100755 diff --git a/course/dndupload.php b/course/dndupload.php old mode 100644 new mode 100755 diff --git a/course/dnduploadlib.php b/course/dnduploadlib.php old mode 100644 new mode 100755 diff --git a/course/edit.php b/course/edit.php old mode 100644 new mode 100755 diff --git a/course/edit_form.php b/course/edit_form.php old mode 100644 new mode 100755 diff --git a/course/editcategory.php b/course/editcategory.php old mode 100644 new mode 100755 diff --git a/course/editcategory_form.php b/course/editcategory_form.php old mode 100644 new mode 100755 diff --git a/course/editsection.php b/course/editsection.php old mode 100644 new mode 100755 diff --git a/course/editsection_form.php b/course/editsection_form.php old mode 100644 new mode 100755 diff --git a/course/enrol.php b/course/enrol.php old mode 100644 new mode 100755 diff --git a/course/externallib.php b/course/externallib.php old mode 100644 new mode 100755 diff --git a/course/format/README.txt b/course/format/README.txt old mode 100644 new mode 100755 diff --git a/course/format/renderer.php b/course/format/renderer.php old mode 100644 new mode 100755 diff --git a/course/format/scorm/config.php b/course/format/scorm/config.php old mode 100644 new mode 100755 diff --git a/course/format/scorm/format.php b/course/format/scorm/format.php old mode 100644 new mode 100755 diff --git a/course/format/scorm/lang/en/format_scorm.php b/course/format/scorm/lang/en/format_scorm.php old mode 100644 new mode 100755 diff --git a/course/format/scorm/lib.php b/course/format/scorm/lib.php old mode 100644 new mode 100755 diff --git a/course/format/scorm/version.php b/course/format/scorm/version.php old mode 100644 new mode 100755 diff --git a/course/format/social/config.php b/course/format/social/config.php old mode 100644 new mode 100755 diff --git a/course/format/social/format.php b/course/format/social/format.php old mode 100644 new mode 100755 diff --git a/course/format/social/lang/en/format_social.php b/course/format/social/lang/en/format_social.php old mode 100644 new mode 100755 diff --git a/course/format/social/lib.php b/course/format/social/lib.php old mode 100644 new mode 100755 diff --git a/course/format/social/version.php b/course/format/social/version.php old mode 100644 new mode 100755 diff --git a/course/format/topics/config.php b/course/format/topics/config.php old mode 100644 new mode 100755 diff --git a/course/format/topics/format.js b/course/format/topics/format.js old mode 100644 new mode 100755 diff --git a/course/format/topics/format.php b/course/format/topics/format.php old mode 100644 new mode 100755 diff --git a/course/format/topics/lang/en/format_topics.php b/course/format/topics/lang/en/format_topics.php old mode 100644 new mode 100755 diff --git a/course/format/topics/lib.php b/course/format/topics/lib.php old mode 100644 new mode 100755 diff --git a/course/format/topics/renderer.php b/course/format/topics/renderer.php old mode 100644 new mode 100755 diff --git a/course/format/topics/styles.css b/course/format/topics/styles.css old mode 100644 new mode 100755 diff --git a/course/format/topics/version.php b/course/format/topics/version.php old mode 100644 new mode 100755 diff --git a/course/format/upgrade.txt b/course/format/upgrade.txt old mode 100644 new mode 100755 diff --git a/course/format/weeks/config.php b/course/format/weeks/config.php old mode 100644 new mode 100755 diff --git a/course/format/weeks/format.js b/course/format/weeks/format.js old mode 100644 new mode 100755 diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php old mode 100644 new mode 100755 diff --git a/course/format/weeks/lang/en/format_weeks.php b/course/format/weeks/lang/en/format_weeks.php old mode 100644 new mode 100755 diff --git a/course/format/weeks/lib.php b/course/format/weeks/lib.php old mode 100644 new mode 100755 diff --git a/course/format/weeks/renderer.php b/course/format/weeks/renderer.php old mode 100644 new mode 100755 diff --git a/course/format/weeks/styles.css b/course/format/weeks/styles.css old mode 100644 new mode 100755 diff --git a/course/format/weeks/version.php b/course/format/weeks/version.php old mode 100644 new mode 100755 diff --git a/course/index.php b/course/index.php old mode 100644 new mode 100755 diff --git a/course/info.php b/course/info.php old mode 100644 new mode 100755 diff --git a/course/jumpto.php b/course/jumpto.php old mode 100644 new mode 100755 diff --git a/course/lib.php b/course/lib.php old mode 100644 new mode 100755 diff --git a/course/loginas.php b/course/loginas.php old mode 100644 new mode 100755 diff --git a/course/mod.php b/course/mod.php old mode 100644 new mode 100755 diff --git a/course/modduplicate.php b/course/modduplicate.php old mode 100644 new mode 100755 diff --git a/course/modedit.php b/course/modedit.php old mode 100644 new mode 100755 index 7aa8667..72773f8 --- a/course/modedit.php +++ b/course/modedit.php @@ -36,6 +36,7 @@ $update = optional_param('update', 0, PARAM_INT); $return = optional_param('return', 0, PARAM_BOOL); //return to course/view.php if false or mod/modname/view.php if true $type = optional_param('type', '', PARAM_ALPHANUM); //TODO: hopefully will be removed in 2.0 $sectionreturn = optional_param('sr', null, PARAM_INT); +$nameEvaluateMe = optional_param('name', '', PARAM_TEXT); $url = new moodle_url('/course/modedit.php'); $url->param('sr', $sectionreturn); @@ -82,11 +83,13 @@ if (!empty($add)) { $data->add = $add; $data->return = 0; //must be false if this is an add, go back to course view on cancel $data->sr = $sectionreturn; + if (!empty($nameEvaluateMe)) $data->name = $nameEvaluateMe; if (plugin_supports('mod', $data->modulename, FEATURE_MOD_INTRO, true)) { $draftid_editor = file_get_submitted_draft_itemid('introeditor'); file_prepare_draft_area($draftid_editor, null, null, null, null); - $data->introeditor = array('text'=>'', 'format'=>FORMAT_HTML, 'itemid'=>$draftid_editor); // TODO: add better default + if (!empty($nameEvaluateMe)) $data->introeditor = array('text'=>'Introduce una descripcion', 'format'=>FORMAT_HTML, 'itemid'=>$draftid_editor); // TODO: add better default + else $data->introeditor = array('text'=>'', 'format'=>FORMAT_HTML, 'itemid'=>$draftid_editor); // TODO: add better default } if (plugin_supports('mod', $data->modulename, FEATURE_ADVANCED_GRADING, false) @@ -242,7 +245,10 @@ if (!empty($type)) { //TODO: hopefully will be removed in 2.0 $PAGE->set_pagetype($pagepath); $PAGE->set_pagelayout('admin'); -$modmoodleform = "$CFG->dirroot/mod/$module->name/mod_form.php"; +//Cambio de formulario para que no aparezca el nombre +if (!empty($nameEvaluateMe) and $add == 'feedback' ) $modmoodleform = "$CFG->dirroot/mod/$module->name/mod_formEvaluateMe.php"; +else $modmoodleform = "$CFG->dirroot/mod/$module->name/mod_form.php"; + if (file_exists($modmoodleform)) { require_once($modmoodleform); } else { diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php old mode 100644 new mode 100755 diff --git a/course/pending.php b/course/pending.php old mode 100644 new mode 100755 diff --git a/course/publish/backup.php b/course/publish/backup.php old mode 100644 new mode 100755 diff --git a/course/publish/forms.php b/course/publish/forms.php old mode 100644 new mode 100755 diff --git a/course/publish/hubselector.php b/course/publish/hubselector.php old mode 100644 new mode 100755 diff --git a/course/publish/index.php b/course/publish/index.php old mode 100644 new mode 100755 diff --git a/course/publish/lib.php b/course/publish/lib.php old mode 100644 new mode 100755 diff --git a/course/publish/metadata.php b/course/publish/metadata.php old mode 100644 new mode 100755 diff --git a/course/publish/renderer.php b/course/publish/renderer.php old mode 100644 new mode 100755 diff --git a/course/recent.php b/course/recent.php old mode 100644 new mode 100755 diff --git a/course/recent_form.php b/course/recent_form.php old mode 100644 new mode 100755 diff --git a/course/renderer.php b/course/renderer.php old mode 100644 new mode 100755 diff --git a/course/report.php b/course/report.php old mode 100644 new mode 100755 diff --git a/course/report/lib.php b/course/report/lib.php old mode 100644 new mode 100755 diff --git a/course/request.php b/course/request.php old mode 100644 new mode 100755 diff --git a/course/request_form.php b/course/request_form.php old mode 100644 new mode 100755 diff --git a/course/reset.php b/course/reset.php old mode 100644 new mode 100755 diff --git a/course/reset_form.php b/course/reset_form.php old mode 100644 new mode 100755 diff --git a/course/resources.php b/course/resources.php old mode 100644 new mode 100755 diff --git a/course/rest.php b/course/rest.php old mode 100644 new mode 100755 diff --git a/course/scales.php b/course/scales.php old mode 100644 new mode 100755 diff --git a/course/search.php b/course/search.php old mode 100644 new mode 100755 diff --git a/course/style.css b/course/style.css old mode 100644 new mode 100755 diff --git a/course/switchrole.php b/course/switchrole.php old mode 100644 new mode 100755 diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php old mode 100644 new mode 100755 diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php old mode 100644 new mode 100755 diff --git a/course/togglecompletion.php b/course/togglecompletion.php old mode 100644 new mode 100755 diff --git a/course/user.php b/course/user.php old mode 100644 new mode 100755 diff --git a/course/view.php b/course/view.php old mode 100644 new mode 100755 diff --git a/course/yui/coursebase/coursebase.js b/course/yui/coursebase/coursebase.js old mode 100644 new mode 100755 diff --git a/course/yui/dragdrop/dragdrop.js b/course/yui/dragdrop/dragdrop.js old mode 100644 new mode 100755 diff --git a/course/yui/modchooser/modchooser.js b/course/yui/modchooser/modchooser.js old mode 100644 new mode 100755 diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js old mode 100644 new mode 100755 diff --git a/mod/feedback/README.txt b/mod/feedback/README.txt old mode 100644 new mode 100755 diff --git a/mod/feedback/TODO.txt b/mod/feedback/TODO.txt old mode 100644 new mode 100755 diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php old mode 100644 new mode 100755 diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php old mode 100644 new mode 100755 diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle1/lib.php b/mod/feedback/backup/moodle1/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle2/backup_feedback_activity_task.class.php b/mod/feedback/backup/moodle2/backup_feedback_activity_task.class.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle2/backup_feedback_settingslib.php b/mod/feedback/backup/moodle2/backup_feedback_settingslib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle2/backup_feedback_stepslib.php b/mod/feedback/backup/moodle2/backup_feedback_stepslib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle2/restore_feedback_activity_task.class.php b/mod/feedback/backup/moodle2/restore_feedback_activity_task.class.php old mode 100644 new mode 100755 diff --git a/mod/feedback/backup/moodle2/restore_feedback_stepslib.php b/mod/feedback/backup/moodle2/restore_feedback_stepslib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/choose_group_form.php b/mod/feedback/choose_group_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php old mode 100644 new mode 100755 diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php old mode 100644 new mode 100755 diff --git a/mod/feedback/db/access.php b/mod/feedback/db/access.php old mode 100644 new mode 100755 diff --git a/mod/feedback/db/install.php b/mod/feedback/db/install.php old mode 100644 new mode 100755 diff --git a/mod/feedback/db/install.xml b/mod/feedback/db/install.xml old mode 100644 new mode 100755 diff --git a/mod/feedback/db/log.php b/mod/feedback/db/log.php old mode 100644 new mode 100755 diff --git a/mod/feedback/db/messages.php b/mod/feedback/db/messages.php old mode 100644 new mode 100755 diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_completed_form.php b/mod/feedback/delete_completed_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_item_form.php b/mod/feedback/delete_item_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php old mode 100644 new mode 100755 diff --git a/mod/feedback/delete_template_form.php b/mod/feedback/delete_template_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php old mode 100644 new mode 100755 index ce0e245..9a88d5e --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -208,13 +208,65 @@ if ($do_show == 'templates') { echo ' '; } +////// + + $idcourse = $COURSE->id; + + $feedbackNameTeachers = 'evaluation teachers'; + $feedbackNameActivities = 'evaluation activities'; + $feedbackNameSubject = 'evaluation subject'; + + $existFeedbackTeachers = FALSE; + $existFeedbackActivities = FALSE; + $existFeedbackSubject = FALSE; + + + $feedbacks = get_all_instances_in_course("feedback", $COURSE); + foreach ($feedbacks as $feedback){ + $viewurl = new moodle_url('/mod/feedback/view.php', array('id'=>$feedback->coursemodule)); + + + + if ($feedbackNameTeachers == $feedback->name){ + $existFeedbackTeachers = TRUE; + $preid= (explode("=", $viewurl->out())); + $idTeachers = $preid[1]; + if ($idTeachers == $id){ + $TipoDeForm=3; + } + + } + + if ($feedbackNameActivities == $feedback->name){ + $existFeedbackActivities = TRUE; + $preid= (explode("=", $viewurl->out())); + $idActivities = $preid[1]; + if ($idActivities == $id){ + $TipoDeForm=1; + } + } + + if ($feedbackNameSubject == $feedback->name){ + $existFeedbackSubject = TRUE; + $preid= (explode("=", $viewurl->out())); + $idNameSubject= $preid[1]; + if ($idNameSubject == $id){ + $TipoDeForm=2; + } + } + } +/////// + if (has_capability('mod/feedback:edititems', $context)) { $urlparams = array('action'=>'exportfile', 'id'=>$id); $exporturl = new moodle_url('/mod/feedback/export.php', $urlparams); $importurl = new moodle_url('/mod/feedback/import.php', array('id'=>$id)); + $alexguapourl = new moodle_url('/mod/feedback/import4.php?id='.$id.'&TipoDeForm='.$TipoDeForm, $urlparams); +/////http://localhost/moodle/mod/feedback/import4.php?id=40 echo '

      '.get_string('export_questions', 'feedback').'/ - '.get_string('import_questions', 'feedback').' + '.get_string('import_questions', 'feedback').'/ + Import EvaluateMe

      '; } echo $OUTPUT->box_end(); diff --git a/mod/feedback/edit_form.php b/mod/feedback/edit_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php old mode 100644 new mode 100755 diff --git a/mod/feedback/export.php b/mod/feedback/export.php old mode 100644 new mode 100755 diff --git a/mod/feedback/feedback.js b/mod/feedback/feedback.js old mode 100644 new mode 100755 diff --git a/mod/feedback/import.php b/mod/feedback/import.php old mode 100644 new mode 100755 diff --git a/mod/feedback/import4.php b/mod/feedback/import4.php new file mode 100755 index 0000000..1b3a3c7 --- /dev/null +++ b/mod/feedback/import4.php @@ -0,0 +1,922 @@ +. + +/** + * prints the form to import items from xml-file + * + * @author Andreas Grabs + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License + * @package feedback + */ + +require_once("../../config.php"); +require_once("lib.php"); +require_once('import_form.php'); + + +// get parameters +$id = required_param('id', PARAM_INT); +$choosefile = optional_param('choosefile', false, PARAM_PATH); +$action = optional_param('action', false, PARAM_ALPHA); + +$TipoDeForm = required_param('TipoDeForm', PARAM_INT); // Cual de los 3 forms es? + + +$url = new moodle_url('/mod/feedback/import.php', array('id'=>$id)); +if ($choosefile !== false) { + $url->param('choosefile', $choosefile); +} +if ($action !== false) { + $url->param('action', $action); +} +$PAGE->set_url($url); + +if (! $cm = get_coursemodule_from_id('feedback', $id)) { + print_error('invalidcoursemodule'); +} + +if (! $course = $DB->get_record("course", array("id"=>$cm->course))) { + print_error('coursemisconf'); +} + +if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) { + print_error('invalidcoursemodule'); +} + +if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { + print_error('badcontext'); +} + +require_login($course, true, $cm); + +require_capability('mod/feedback:edititems', $context); +///////////////////////////////////// + require_once($CFG->libdir.'/tablelib.php'); + require_once($CFG->libdir.'/filelib.php'); + + define('USER_SMALL_CLASS', 20); // Below this is considered small + define('USER_LARGE_CLASS', 200); // Above this is considered large + define('DEFAULT_PAGE_SIZE', 20); + define('SHOW_ALL_PAGE_SIZE', 5000); + define('MODE_BRIEF', 0); + define('MODE_USERDETAILS', 1); + + $page = optional_param('page', 0, PARAM_INT); // which page to show + $perpage = optional_param('perpage', DEFAULT_PAGE_SIZE, PARAM_INT); // how many per page + $mode = optional_param('mode', NULL, PARAM_INT); // use the MODE_ constants + $accesssince = optional_param('accesssince',0,PARAM_INT); // filter by last access. -1 = never + $search = optional_param('search','',PARAM_RAW); // make sure it is processed with p() or s() when sending to output! + $roleid = 3; + + $contextid = optional_param('contextid', 0, PARAM_INT); // one of this or + $courseid = optional_param('id', 0, PARAM_INT); // this are required + + $PAGE->set_url('/user/index.php', array( + 'page' => $page, + 'perpage' => $perpage, + 'mode' => $mode, + 'accesssince' => $accesssince, + 'search' => $search, + 'roleid' => $roleid, + 'contextid' => $contextid, + 'id' => $courseid)); + + if ($contextid) { + $context = get_context_instance_by_id($contextid, MUST_EXIST); + if ($context->contextlevel != CONTEXT_COURSE) { + print_error('invalidcontext'); + } + $course = $DB->get_record('course', array('id'=>$context->instanceid), '*', MUST_EXIST); + } else { + $course2 = $course; + $context2 = get_context_instance(CONTEXT_COURSE, $course2->id, MUST_EXIST); + } + // not needed anymore + unset($contextid); + unset($courseid); + + require_login($course); + + $systemcontext = get_context_instance(CONTEXT_SYSTEM); + $isfrontpage = ($course->id == SITEID); + + $frontpagectx = get_context_instance(CONTEXT_COURSE, SITEID); + + if ($isfrontpage) { + $PAGE->set_pagelayout('admin'); + require_capability('moodle/site:viewparticipants', $systemcontext); + } else { + $PAGE->set_pagelayout('incourse'); + require_capability('moodle/course:viewparticipants', $context); + } + + $rolenamesurl = new moodle_url("$CFG->wwwroot/user/index.php?contextid=$context->id&sifirst=&silast="); + + $allroles = get_all_roles(); + $roles = get_profile_roles($context); + $allrolenames = array(); + if ($isfrontpage) { + $rolenames = array(0=>get_string('allsiteusers', 'role')); + } else { + $rolenames = array(0=>get_string('allparticipants')); + } + + foreach ($allroles as $role) { + $allrolenames[$role->id] = strip_tags(role_get_name($role, $context2)); // Used in menus etc later on + if (isset($roles[$role->id])) { + $rolenames[$role->id] = $allrolenames[$role->id]; + } + } + + // make sure other roles may not be selected by any means + if (empty($rolenames[$roleid])) { + print_error('noparticipants'); + } + + // no roles to display yet? + // frontpage course is an exception, on the front page course we should display all users + if (empty($rolenames) && !$isfrontpage) { + if (has_capability('moodle/role:assign', $context)) { + redirect($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id); + } else { + print_error('noparticipants'); + } + } + + add_to_log($course->id, 'user', 'view all', 'index.php?id='.$course->id, ''); + + $bulkoperations = has_capability('moodle/course:bulkmessaging', $context); + + $countries = get_string_manager()->get_list_of_countries(); + + $strnever = get_string('never'); + + $datestring = new stdClass(); + $datestring->year = get_string('year'); + $datestring->years = get_string('years'); + $datestring->day = get_string('day'); + $datestring->days = get_string('days'); + $datestring->hour = get_string('hour'); + $datestring->hours = get_string('hours'); + $datestring->min = get_string('min'); + $datestring->mins = get_string('mins'); + $datestring->sec = get_string('sec'); + $datestring->secs = get_string('secs'); + + if ($mode !== NULL) { + $mode = (int)$mode; + $SESSION->userindexmode = $mode; + } else if (isset($SESSION->userindexmode)) { + $mode = (int)$SESSION->userindexmode; + } else { + $mode = MODE_BRIEF; + } + +/// Check to see if groups are being used in this course +/// and if so, set $currentgroup to reflect the current group + + $groupmode = groups_get_course_groupmode($course); // Groups are being used + $currentgroup = groups_get_course_group($course, true); + + if (!$currentgroup) { // To make some other functions work better later + $currentgroup = NULL; + } + + $isseparategroups = ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)); + + $PAGE->set_title("$course->shortname: ".get_string('participants')); + $PAGE->set_heading($course->fullname); + $PAGE->set_pagetype('course-view-' . $course->format); + $PAGE->add_body_class('path-user'); // So we can style it independently + $PAGE->set_other_editing_capability('moodle/course:manageactivities'); + +// echo $OUTPUT->header(); + + // echo '
      '; + + if ($isseparategroups and (!$currentgroup) ) { + // The user is not in the group so show message and exit + // echo $OUTPUT->heading(get_string("notingroup")); + // echo $OUTPUT->footer(); + exit; + } + + + // Should use this variable so that we don't break stuff every time a variable is added or changed. + $baseurl = new moodle_url('/user/index.php', array( + 'contextid' => $context->id, + 'roleid' => $roleid, + 'id' => $course->id, + 'perpage' => $perpage, + 'accesssince' => $accesssince, + 'search' => s($search))); + +/// setting up tags + if ($course->id == SITEID) { + $filtertype = 'site'; + } else if ($course->id && !$currentgroup) { + $filtertype = 'course'; + $filterselect = $course->id; + } else { + $filtertype = 'group'; + $filterselect = $currentgroup; + } + + + +/// Get the hidden field list + if (has_capability('moodle/course:viewhiddenuserfields', $context)) { + $hiddenfields = array(); // teachers and admins are allowed to see everything + } else { + $hiddenfields = array_flip(explode(',', $CFG->hiddenuserfields)); + } + + if (isset($hiddenfields['lastaccess'])) { + // do not allow access since filtering + $accesssince = 0; + } + +/// Print settings and things in a table across the top + $controlstable = new html_table(); + $controlstable->attributes['class'] = 'controls'; + $controlstable->cellspacing = 0; + $controlstable->data[] = new html_table_row(); + +/// Print my course menus + if ($mycourses = enrol_get_my_courses()) { + $courselist = array(); + $popupurl = new moodle_url('/user/index.php?roleid='.$roleid.'&sifirst=&silast='); + foreach ($mycourses as $mycourse) { + $coursecontext = get_context_instance(CONTEXT_COURSE, $mycourse->id); + $courselist[$mycourse->id] = format_string($mycourse->shortname, true, array('context' => $coursecontext)); + } + if (has_capability('moodle/site:viewparticipants', $systemcontext)) { + unset($courselist[SITEID]); + $courselist = array(SITEID => format_string($SITE->shortname, true, array('context' => $systemcontext))) + $courselist; + } + $select = new single_select($popupurl, 'id', $courselist, $course->id, array(''=>'choosedots'), 'courseform'); + $select->set_label(get_string('mycourses')); + $controlstable->data[0]->cells[] = $OUTPUT->render($select); + } + + $controlstable->data[0]->cells[] = groups_print_course_menu($course, $baseurl->out(), true); + + if (!isset($hiddenfields['lastaccess'])) { + // get minimum lastaccess for this course and display a dropbox to filter by lastaccess going back this far. + // we need to make it diferently for normal courses and site course + if (!$isfrontpage) { + $minlastaccess = $DB->get_field_sql('SELECT min(timeaccess) + FROM {user_lastaccess} + WHERE courseid = ? + AND timeaccess != 0', array($course->id)); + $lastaccess0exists = $DB->record_exists('user_lastaccess', array('courseid'=>$course->id, 'timeaccess'=>0)); + } else { + $minlastaccess = $DB->get_field_sql('SELECT min(lastaccess) + FROM {user} + WHERE lastaccess != 0'); + $lastaccess0exists = $DB->record_exists('user', array('lastaccess'=>0)); + } + + $now = usergetmidnight(time()); + $timeaccess = array(); + $baseurl->remove_params('accesssince'); + + // makes sense for this to go first. + $timeoptions[0] = get_string('selectperiod'); + + // days + for ($i = 1; $i < 7; $i++) { + if (strtotime('-'.$i.' days',$now) >= $minlastaccess) { + $timeoptions[strtotime('-'.$i.' days',$now)] = get_string('numdays','moodle',$i); + } + } + // weeks + for ($i = 1; $i < 10; $i++) { + if (strtotime('-'.$i.' weeks',$now) >= $minlastaccess) { + $timeoptions[strtotime('-'.$i.' weeks',$now)] = get_string('numweeks','moodle',$i); + } + } + // months + for ($i = 2; $i < 12; $i++) { + if (strtotime('-'.$i.' months',$now) >= $minlastaccess) { + $timeoptions[strtotime('-'.$i.' months',$now)] = get_string('nummonths','moodle',$i); + } + } + // try a year + if (strtotime('-1 year',$now) >= $minlastaccess) { + $timeoptions[strtotime('-1 year',$now)] = get_string('lastyear'); + } + + if (!empty($lastaccess0exists)) { + $timeoptions[-1] = get_string('never'); + } + + if (count($timeoptions) > 1) { + $select = new single_select($baseurl, 'accesssince', $timeoptions, $accesssince, null, 'timeoptions'); + $select->set_label(get_string('usersnoaccesssince')); + $controlstable->data[0]->cells[] = $OUTPUT->render($select); + } + } + + $formatmenu = array( '0' => get_string('brief'), + '1' => get_string('userdetails')); + $select = new single_select($baseurl, 'mode', $formatmenu, $mode, null, 'formatmenu'); + $select->set_label(get_string('userlist')); + $userlistcell = new html_table_cell(); + $userlistcell->attributes['class'] = 'right'; + $userlistcell->text = $OUTPUT->render($select); + $controlstable->data[0]->cells[] = $userlistcell; + + // echo html_writer::table($controlstable); + + if ($currentgroup and (!$isseparategroups or has_capability('moodle/site:accessallgroups', $context))) { /// Display info about the group + if ($group = groups_get_group($currentgroup)) { + if (!empty($group->description) or (!empty($group->picture) and empty($group->hidepicture))) { + $groupinfotable = new html_table(); + $groupinfotable->attributes['class'] = 'groupinfobox'; + $picturecell = new html_table_cell(); + $picturecell->attributes['class'] = 'left side picture'; + $picturecell->text = print_group_picture($group, $course->id, true, true, false); + + $contentcell = new html_table_cell(); + $contentcell->attributes['class'] = 'content'; + + $contentheading = $group->name; + if (has_capability('moodle/course:managegroups', $context)) { + $aurl = new moodle_url('/group/group.php', array('id' => $group->id, 'courseid' => $group->courseid)); + $contentheading .= ' ' . $OUTPUT->action_icon($aurl, new pix_icon('t/edit', get_string('editgroupprofile'))); + } + + $group->description = file_rewrite_pluginfile_urls($group->description, 'pluginfile.php', $context->id, 'group', 'description', $group->id); + if (!isset($group->descriptionformat)) { + $group->descriptionformat = FORMAT_MOODLE; + } + $options = array('overflowdiv'=>true); + $contentcell->text = $OUTPUT->heading($contentheading, 3) . format_text($group->description, $group->descriptionformat, $options); + $groupinfotable->data[] = new html_table_row(array($picturecell, $contentcell)); + //echo html_writer::table($groupinfotable); + } + } + } + + /// Define a table showing a list of users in the current role selection + + $tablecolumns = array('userpic', 'fullname'); + $extrafields = get_extra_user_fields($context); + $tableheaders = array(get_string('userpic'), get_string('fullnameuser')); + if ($mode === MODE_BRIEF) { + foreach ($extrafields as $field) { + $tablecolumns[] = $field; + $tableheaders[] = get_user_field_name($field); + } + } + if ($mode === MODE_BRIEF && !isset($hiddenfields['city'])) { + $tablecolumns[] = 'city'; + $tableheaders[] = get_string('city'); + } + if ($mode === MODE_BRIEF && !isset($hiddenfields['country'])) { + $tablecolumns[] = 'country'; + $tableheaders[] = get_string('country'); + } + if (!isset($hiddenfields['lastaccess'])) { + $tablecolumns[] = 'lastaccess'; + $tableheaders[] = get_string('lastaccess'); + } + + if ($bulkoperations) { + $tablecolumns[] = 'select'; + $tableheaders[] = get_string('select'); + } + + $table = new flexible_table('user-index-participants-'.$course->id); + $table->define_columns($tablecolumns); + $table->define_headers($tableheaders); + $table->define_baseurl($baseurl->out()); + + if (!isset($hiddenfields['lastaccess'])) { + $table->sortable(true, 'lastaccess', SORT_DESC); + } else { + $table->sortable(true, 'firstname', SORT_ASC); + } + + $table->no_sorting('roles'); + $table->no_sorting('groups'); + $table->no_sorting('groupings'); + $table->no_sorting('select'); + + $table->set_attribute('cellspacing', '0'); + $table->set_attribute('id', 'participants'); + $table->set_attribute('class', 'generaltable generalbox'); + + $table->set_control_variables(array( + TABLE_VAR_SORT => 'ssort', + TABLE_VAR_HIDE => 'shide', + TABLE_VAR_SHOW => 'sshow', + TABLE_VAR_IFIRST => 'sifirst', + TABLE_VAR_ILAST => 'silast', + TABLE_VAR_PAGE => 'spage' + )); + $table->setup(); + + // we are looking for all users with this role assigned in this context or higher + $contextlist = get_related_contexts_string($context); + + list($esql, $params) = get_enrolled_sql($context, NULL, $currentgroup, true); + $joins = array("FROM {user} u"); + $wheres = array(); + + $extrasql = get_extra_user_fields_sql($context, 'u', '', array( + 'id', 'username', 'firstname', 'lastname', 'email', 'city', 'country', + 'picture', 'lang', 'timezone', 'maildisplay', 'imagealt', 'lastaccess')); + + if ($isfrontpage) { + $select = "SELECT u.id, u.username, u.firstname, u.lastname, + u.email, u.city, u.country, u.picture, + u.lang, u.timezone, u.maildisplay, u.imagealt, + u.lastaccess$extrasql"; + $joins[] = "JOIN ($esql) e ON e.id = u.id"; // everybody on the frontpage usually + if ($accesssince) { + $wheres[] = get_user_lastaccess_sql($accesssince); + } + + } else { + $select = "SELECT u.id, u.username, u.firstname, u.lastname, + u.email, u.city, u.country, u.picture, + u.lang, u.timezone, u.maildisplay, u.imagealt, + COALESCE(ul.timeaccess, 0) AS lastaccess$extrasql"; + $joins[] = "JOIN ($esql) e ON e.id = u.id"; // course enrolled users only + $joins[] = "LEFT JOIN {user_lastaccess} ul ON (ul.userid = u.id AND ul.courseid = :courseid)"; // not everybody accessed course yet + $params['courseid'] = $course->id; + if ($accesssince) { + $wheres[] = get_course_lastaccess_sql($accesssince); + } + } + + // performance hacks - we preload user contexts together with accounts + list($ccselect, $ccjoin) = context_instance_preload_sql('u.id', CONTEXT_USER, 'ctx'); + $select .= $ccselect; + $joins[] = $ccjoin; + + + // limit list to users with some role only + if ($roleid) { + $wheres[] = "u.id IN (SELECT userid FROM {role_assignments} WHERE roleid = :roleid AND contextid $contextlist)"; + $params['roleid'] = $roleid; + } + + + $from = implode("\n", $joins); + if ($wheres) { + $where = "WHERE " . implode(" AND ", $wheres); + } else { + $where = ""; + } + + $totalcount = $DB->count_records_sql("SELECT COUNT(u.id) $from $where", $params); + + if (!empty($search)) { + + // echo "
      "; + $wheres[] = "(". $DB->sql_like($fullname, ':search1', false, false) . + " OR ". $DB->sql_like('email', ':search2', false, false) . + " OR ". $DB->sql_like('idnumber', ':search3', false, false) .") "; + $params['search1'] = "%$search%"; + $params['search2'] = "%$search%"; + $params['search3'] = "%$search%"; + } + + list($twhere, $tparams) = $table->get_sql_where(); + if ($twhere) { + $wheres[] = $twhere; + $params = array_merge($params, $tparams); + } + + $from = implode("\n", $joins); + if ($wheres) { + $where = "WHERE " . implode(" AND ", $wheres); + } else { + $where = ""; + } + + if ($table->get_sql_sort()) { + $sort = ' ORDER BY '.$table->get_sql_sort(); + } else { + $sort = ''; + } + + $matchcount = $DB->count_records_sql("SELECT COUNT(u.id) $from $where", $params); + + $table->initialbars(true); + $table->pagesize($perpage, $matchcount); + + // list of users at the current visible page - paging makes it relatively short + $userlist = $DB->get_recordset_sql("$select $from $where $sort", $params, $table->get_page_start(), $table->get_page_size()); + + /// If there are multiple Roles in the course, then show a drop down menu for switching + if (count($rolenames) > 1) { + /* echo '
      '; + echo ''; + echo $OUTPUT->single_select($rolenamesurl, 'roleid', $rolenames, $roleid, null, 'rolesform'); + echo '
      ';*/ + + } else if (count($rolenames) == 1) { + // when all users with the same role - print its name + /* echo '
      '; + echo get_string('role').get_string('labelsep', 'langconfig');*/ + $rolename = reset($rolenames); + /* echo $rolename; + echo '
      ';*/ + } + + if ($roleid > 0) { + $a = new stdClass(); + $a->number = $totalcount; + $a->role = $rolenames[$roleid]; + $heading = format_string(get_string('xuserswiththerole', 'role', $a)); + + if ($currentgroup and $group) { + $a->group = $group->name; + $heading .= ' ' . format_string(get_string('ingroup', 'role', $a)); + } + + if ($accesssince) { + $a->timeperiod = $timeoptions[$accesssince]; + $heading .= ' ' . format_string(get_string('inactiveformorethan', 'role', $a)); + } + + $heading .= ": $a->number"; + + if (user_can_assign($context, $roleid)) { + $heading .= ' '; + $heading .= ''; + } + // echo $OUTPUT->heading($heading, 3); + } else { + if ($course->id != SITEID && has_capability('moodle/course:enrolreview', $context)) { + $editlink = $OUTPUT->action_icon(new moodle_url('/enrol/users.php', array('id' => $course->id)), + new pix_icon('i/edit', get_string('edit'))); + } else { + $editlink = ''; + } + if ($course->id == SITEID and $roleid < 0) { + $strallparticipants = get_string('allsiteusers', 'role'); + } else { + $strallparticipants = get_string('allparticipants'); + } + if ($matchcount < $totalcount) { + echo $OUTPUT->heading($strallparticipants.get_string('labelsep', 'langconfig').$matchcount.'/'.$totalcount . $editlink, 3); + } else { + echo $OUTPUT->heading($strallparticipants.get_string('labelsep', 'langconfig').$matchcount . $editlink, 3); + } + } + + ////////////////////////////////////////// ///////////////////////////7 + +$xmlcontent = ''; +if ($TipoDeForm == 1){ +///// PREGUNTAS Trabajos //////////////////////////////////////////// + $assignments = get_all_instances_in_course("assign", $course); + + foreach ($assignments as $assignment) { + $xmlcontent .= 'id, 0, false, MUST_EXIST); + $xmlcontent .= $assignment->name; + $xmlcontent .= ': Te ha parecido interesante?]]>>>>>Nada|Poco|Normal|Bastante|Mucho]]>'; + $xmlcontent .= 'name; + $xmlcontent .= ': Comentarios]]>'; + } +////////////////////////////////////////////////////////////////////// +} +if ($TipoDeForm == 2){ +///// PREGUNTAS CURSO //////////////////////////////////////////// + $xmlcontent .= 'fullname; + $xmlcontent .= ': Te ha parecido interesante el curso?]]>>>>>Nada|Poco|Normal|Bastante|Mucho]]>'; + $xmlcontent .= 'fullname; + $xmlcontent .= ': Comentarios sobre el curso]]>'; +//////////////////////////////////////////////////////////////////// +} +if ($TipoDeForm == 3){ + $countrysort = (strpos($sort, 'country') !== false); + $timeformat = get_string('strftimedate'); + + + + + $usersprinted = array(); + foreach ($userlist as $user) { + + + // echo $OUTPUT->container(fullname($user, has_capability('moodle/site:viewfullnames', $context)), 'username'); + $xmlcontent .= 'container(fullname($user, has_capability('moodle/site:viewfullnames', $context)), 'username'); + $xmlcontent .= ': Que te ha parecido este profesor?]]>>>>>Nada|Poco|Normal|Bastante|Mucho]]>'; + $xmlcontent .= 'container(fullname($user, has_capability('moodle/site:viewfullnames', $context)), 'username'); + $xmlcontent .= ': Comentarios sobre el profesor]]>'; + + } + +} + +$xmlcontent .= ''; +//////////////////////////////////////////// + + + + $xmldata = feedback_load_xml_data($xmlcontent); + + feedback_import_loaded_data($xmldata, $feedback->id); +/* + if ($importerror->stat == true) { + $url = 'edit.php?id='.$id.'&do_show=templates'; + redirect($url, get_string('import_successfully', 'feedback'), 3); + exit; + } +} + + +/// Print the page header +$strfeedbacks = get_string("modulenameplural", "feedback"); +$strfeedback = get_string("modulename", "feedback"); + +$PAGE->set_heading(format_string($course->fullname)); +$PAGE->set_title(format_string($feedback->name)); +echo $OUTPUT->header(); + +/// print the tabs +require('tabs.php'); +*/ +/// Print the main part of the page +/////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// +//echo $OUTPUT->heading(get_string('import_questions', 'feedback')); +/* +if (isset($importerror->msg) AND is_array($importerror->msg)) { + echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter'); + foreach ($importerror->msg as $msg) { + echo $msg.'
      '; + } + echo $OUTPUT->box_end(); +} + +$mform->display(); +*/ + // Print the header +$strplural = get_string("modulenameplural", "assign"); +$PAGE->navbar->add($strplural); +$PAGE->set_title($strplural); +$PAGE->set_heading($course->fullname); + +$url = 'view.php?id='.$id.'&do_show=view'; +//$url = 'import3.php?id='.$id; +redirect($url, get_string('import_successfully', 'feedback'), 3); +echo $OUTPUT->header(); + + + + + +echo $OUTPUT->footer(); + +function feedback_load_xml_data($xmlcontent) { + global $CFG, $DB; + require_once($CFG->dirroot.'/lib/xmlize.php'); + + if (!$xmlcontent = feedback_check_xml_utf8($xmlcontent)) { + return false; + } + + //echo ":Antes:"; + ///////////////////////////////////////////// + //$id = required_param('id', PARAM_INT); + //$cm = get_coursemodule_from_id('feedback', $id); + //$course = $DB->get_record("course", array("id"=>$cm->course)); +/* + $assignments = get_all_instances_in_course("assign", $course); + + $xmlcontent = ''; +//$xmlcontent = $xmlcontent + 'sda'; + foreach ($assignments as $assignment) { + $xmlcontent .= 'id, 0, false, MUST_EXIST); + //echo $assignment->name; + //echo "
      "; + $xmlcontent .= $assignment->name; + $xmlcontent .= ': Te ha parecido interesante?]]>      >>>>Nada|Poco|Normal|Bastante|Mucho]]>      '; + $xmlcontent .= 'name; + $xmlcontent .= ': Comentarios]]>'; + + +} + +$xmlcontent .= '      '; + + //echo "LOLER:"; + //echo $xmlcontent; + */ + ///////////////////////////////////////////// + $data = xmlize($xmlcontent, 1, 'UTF-8'); + //echo ":Despues:"; + //echo $data; + + if (intval($data['FEEDBACK']['@']['VERSION']) != 200701) { + return false; + } + $data = $data['FEEDBACK']['#']['ITEMS'][0]['#']['ITEM']; + return $data; +} + +function feedback_import_loaded_data(&$data, $feedbackid) { + global $CFG, $DB; + + feedback_load_feedback_items(); + + //$deleteolditems = optional_param('deleteolditems', 0, PARAM_INT); +$deleteolditems = 1; + + $error = new stdClass(); + $error->stat = true; + $error->msg = array(); + + if (!is_array($data)) { + $error->msg[] = get_string('data_is_not_an_array', 'feedback'); + $error->stat = false; + return $error; + } + + if ($deleteolditems) { + feedback_delete_all_items($feedbackid); + $position = 0; + } else { + //items will be add to the end of the existing items + $position = $DB->count_records('feedback_item', array('feedback'=>$feedbackid)); + } + + //depend items we are storing temporary in an mapping list array(new id => dependitem) + //we also store a mapping of all items array(oldid => newid) + $dependitemsmap = array(); + $itembackup = array(); + foreach ($data as $item) { + $position++; + //check the typ + $typ = $item['@']['TYPE']; + //echo $typ; + //check oldtypes first + switch($typ) { + case 'radio': + $typ = 'multichoice'; + $oldtyp = 'radio'; + break; + case 'dropdown': + $typ = 'multichoice'; + $oldtyp = 'dropdown'; + break; + case 'check': + $typ = 'multichoice'; + $oldtyp = 'check'; + break; + case 'radiorated': + $typ = 'multichoicerated'; + $oldtyp = 'radiorated'; + break; + case 'dropdownrated': + $typ = 'multichoicerated'; + $oldtyp = 'dropdownrated'; + break; + default: + $oldtyp = $typ; + } + + $itemclass = 'feedback_item_'.$typ; + if ($typ != 'pagebreak' AND !class_exists($itemclass)) { + $error->stat = false; + $error->msg[] = 'type ('.$typ.') not found'; + continue; + } + $itemobj = new $itemclass(); + + $newitem = new stdClass(); + $newitem->feedback = $feedbackid; + $newitem->template = 0; + $newitem->typ = $typ; + $newitem->name = trim($item['#']['ITEMTEXT'][0]['#']); + $newitem->label = trim($item['#']['ITEMLABEL'][0]['#']); + $newitem->options = trim($item['#']['OPTIONS'][0]['#']); + $newitem->presentation = trim($item['#']['PRESENTATION'][0]['#']); + //check old types of radio, check, and so on + switch($oldtyp) { + case 'radio': + $newitem->presentation = 'r>>>>>'.$newitem->presentation; + break; + case 'dropdown': + $newitem->presentation = 'd>>>>>'.$newitem->presentation; + break; + case 'check': + $newitem->presentation = 'c>>>>>'.$newitem->presentation; + break; + case 'radiorated': + $newitem->presentation = 'r>>>>>'.$newitem->presentation; + break; + case 'dropdownrated': + $newitem->presentation = 'd>>>>>'.$newitem->presentation; + break; + } + + if (isset($item['#']['DEPENDITEM'][0]['#'])) { + $newitem->dependitem = intval($item['#']['DEPENDITEM'][0]['#']); + } else { + $newitem->dependitem = 0; + } + if (isset($item['#']['DEPENDVALUE'][0]['#'])) { + $newitem->dependvalue = trim($item['#']['DEPENDVALUE'][0]['#']); + } else { + $newitem->dependvalue = ''; + } + $olditemid = intval($item['#']['ITEMID'][0]['#']); + + if ($typ != 'pagebreak') { + $newitem->hasvalue = $itemobj->get_hasvalue(); + } else { + $newitem->hasvalue = 0; + } + $newitem->required = intval($item['@']['REQUIRED']); + $newitem->position = $position; + $newid = $DB->insert_record('feedback_item', $newitem); + + $itembackup[$olditemid] = $newid; + if ($newitem->dependitem) { + $dependitemsmap[$newid] = $newitem->dependitem; + } + + } + //remapping the dependency + foreach ($dependitemsmap as $key => $dependitem) { + $newitem = $DB->get_record('feedback_item', array('id'=>$key)); + $newitem->dependitem = $itembackup[$newitem->dependitem]; + $DB->update_record('feedback_item', $newitem); + } + + return $error; +} + +function feedback_check_xml_utf8($text) { + //find the encoding + $searchpattern = '/^\<\?xml.+(encoding=\"([a-z0-9-]*)\").+\?\>/is'; + + if (!preg_match($searchpattern, $text, $match)) { + return false; //no xml-file + } + + //$match[0] = \<\? xml ... \?\> (without \) + //$match[1] = encoding="...." + //$match[2] = ISO-8859-1 or so on + if (isset($match[0]) AND !isset($match[1])) { //no encoding given. we assume utf-8 + return $text; + } + + //encoding is given in $match[2] + if (isset($match[0]) AND isset($match[1]) AND isset($match[2])) { + $enc = $match[2]; + return textlib::convert($text, $enc); + } +} + +function get_course_lastaccess_sql($accesssince='') { + if (empty($accesssince)) { + return ''; + } + if ($accesssince == -1) { // never + return 'ul.timeaccess = 0'; + } else { + return 'ul.timeaccess != 0 AND ul.timeaccess < '.$accesssince; + } +} + +function get_user_lastaccess_sql($accesssince='') { + if (empty($accesssince)) { + return ''; + } + if ($accesssince == -1) { // never + return 'u.lastaccess = 0'; + } else { + return 'u.lastaccess != 0 AND u.lastaccess < '.$accesssince; + } +} diff --git a/mod/feedback/import_form.php b/mod/feedback/import_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/index.php b/mod/feedback/index.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/captcha/captcha_form.php b/mod/feedback/item/captcha/captcha_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/captcha/print_captcha.php b/mod/feedback/item/captcha/print_captcha.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/feedback_item_form_class.php b/mod/feedback/item/feedback_item_form_class.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/info/info_form.php b/mod/feedback/item/info/info_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/label/label_form.php b/mod/feedback/item/label/label_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/multichoicerated/multichoicerated_form.php b/mod/feedback/item/multichoicerated/multichoicerated_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/numeric/numeric_form.php b/mod/feedback/item/numeric/numeric_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/textarea/textarea_form.php b/mod/feedback/item/textarea/textarea_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/item/textfield/textfield_form.php b/mod/feedback/item/textfield/textfield_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php old mode 100644 new mode 100755 diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php old mode 100644 new mode 100755 diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php old mode 100644 new mode 100755 diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/mod_formEvaluateMe.php b/mod/feedback/mod_formEvaluateMe.php new file mode 100755 index 0000000..a0caf43 --- /dev/null +++ b/mod/feedback/mod_formEvaluateMe.php @@ -0,0 +1,236 @@ +. + +/** + * print the form to add or edit a feedback-instance + * + * @author Andreas Grabs + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License + * @package feedback + */ + +//It must be included from a Moodle page +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); +} +require_once($CFG->dirroot.'/course/moodleform_mod.php'); + +class mod_feedback_mod_form extends moodleform_mod { + + public function definition() { + global $CFG, $DB; + + $editoroptions = feedback_get_editor_options(); + + $mform =& $this->_form; + + //------------------------------------------------------------------------------- + $mform->addElement('header', 'general', get_string('general', 'form')); + + $mform->addElement('hidden', 'name', get_string('name', 'feedback'), array('size'=>'64')); + $mform->setType('name', PARAM_TEXT); + $mform->addRule('name', null, 'required', null, 'client'); + + $this->add_intro_editor(true, get_string('description', 'feedback')); + + //------------------------------------------------------------------------------- + $mform->addElement('header', 'timinghdr', get_string('timing', 'form')); + + $enableopengroup = array(); + $enableopengroup[] =& $mform->createElement('checkbox', + 'openenable', + get_string('feedbackopen', 'feedback')); + + $enableopengroup[] =& $mform->createElement('date_time_selector', 'timeopen', ''); + $mform->addGroup($enableopengroup, + 'enableopengroup', + get_string('feedbackopen', 'feedback'), + ' ', + false); + + $mform->addHelpButton('enableopengroup', 'timeopen', 'feedback'); + $mform->disabledIf('enableopengroup', 'openenable', 'notchecked'); + + $enableclosegroup = array(); + $enableclosegroup[] =& $mform->createElement('checkbox', + 'closeenable', + get_string('feedbackclose', 'feedback')); + + $enableclosegroup[] =& $mform->createElement('date_time_selector', 'timeclose', ''); + $mform->addGroup($enableclosegroup, + 'enableclosegroup', + get_string('feedbackclose', 'feedback'), + ' ', + false); + + $mform->addHelpButton('enableclosegroup', 'timeclose', 'feedback'); + $mform->disabledIf('enableclosegroup', 'closeenable', 'notchecked'); + + //------------------------------------------------------------------------------- + $mform->addElement('header', 'feedbackhdr', get_string('feedback_options', 'feedback')); + + $options=array(); + $options[1] = get_string('anonymous', 'feedback'); + $options[2] = get_string('non_anonymous', 'feedback'); + $mform->addElement('select', + 'anonymous', + get_string('anonymous_edit', 'feedback'), + $options); + + $mform->addElement('selectyesno', + 'publish_stats', + get_string('show_analysepage_after_submit', 'feedback')); + + $mform->addElement('selectyesno', + 'email_notification', + get_string('email_notification', 'feedback')); + + $mform->addHelpButton('email_notification', 'emailnotification', 'feedback'); + + // check if there is existing responses to this feedback + if (is_numeric($this->_instance) AND + $this->_instance AND + $feedback = $DB->get_record("feedback", array("id"=>$this->_instance))) { + + $completed_feedback_count = feedback_get_completeds_group_count($feedback); + } else { + $completed_feedback_count = false; + } + + if ($completed_feedback_count) { + $multiple_submit_value = $feedback->multiple_submit ? get_string('yes') : get_string('no'); + $mform->addElement('text', + 'multiple_submit_static', + get_string('multiple_submit', 'feedback'), + array('size'=>'4', + 'disabled'=>'disabled', + 'value'=>$multiple_submit_value)); + + $mform->addElement('hidden', 'multiple_submit', ''); + $mform->setType('', PARAM_INT); + $mform->addHelpButton('multiple_submit_static', 'multiplesubmit', 'feedback'); + } else { + $mform->addElement('selectyesno', + 'multiple_submit', + get_string('multiple_submit', 'feedback')); + + $mform->addHelpButton('multiple_submit', 'multiplesubmit', 'feedback'); + } + $mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback')); + $mform->addHelpButton('autonumbering', 'autonumbering', 'feedback'); + + //------------------------------------------------------------------------------- + $mform->addElement('header', 'aftersubmithdr', get_string('after_submit', 'feedback')); + + $mform->addElement('editor', + 'page_after_submit_editor', + get_string("page_after_submit", "feedback"), + null, + $editoroptions); + + $mform->setType('page_after_submit_editor', PARAM_RAW); + + $mform->addElement('text', + 'site_after_submit', + get_string('url_for_continue_button', 'feedback'), + array('size'=>'64', 'maxlength'=>'255')); + + $mform->setType('site_after_submit', PARAM_TEXT); + $mform->addHelpButton('site_after_submit', 'url_for_continue', 'feedback'); + //------------------------------------------------------------------------------- + $this->standard_coursemodule_elements(); + //------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); + } + + public function data_preprocessing(&$default_values) { + if (empty($default_values['timeopen'])) { + $default_values['openenable'] = 0; + } else { + $default_values['openenable'] = 1; + } + if (empty($default_values['timeclose'])) { + $default_values['closeenable'] = 0; + } else { + $default_values['closeenable'] = 1; + } + + $editoroptions = feedback_get_editor_options(); + + if ($this->current->instance) { + // editing an existing feedback - let us prepare the added editor elements (intro done automatically) + $draftitemid = file_get_submitted_draft_itemid('page_after_submit'); + $default_values['page_after_submit_editor']['text'] = + file_prepare_draft_area($draftitemid, $this->context->id, + 'mod_feedback', 'page_after_submit', false, + $editoroptions, + $default_values['page_after_submit']); + + $default_values['page_after_submit_editor']['format'] = $default_values['page_after_submitformat']; + $default_values['page_after_submit_editor']['itemid'] = $draftitemid; + } else { + // adding a new feedback instance + $draftitemid = file_get_submitted_draft_itemid('page_after_submit_editor'); + + // no context yet, itemid not used + file_prepare_draft_area($draftitemid, null, 'mod_feedback', 'page_after_submit', false); + $default_values['page_after_submit_editor']['text'] = ''; + $default_values['page_after_submit_editor']['format'] = editors_get_preferred_format(); + $default_values['page_after_submit_editor']['itemid'] = $draftitemid; + } + + } + + public function get_data() { + $data = parent::get_data(); + if ($data) { + $data->page_after_submitformat = $data->page_after_submit_editor['format']; + $data->page_after_submit = $data->page_after_submit_editor['text']; + + // Turn off completion settings if the checkboxes aren't ticked + $autocompletion = !empty($data->completion) AND + $data->completion==COMPLETION_TRACKING_AUTOMATIC; + if (empty($data->completion) || !$autocompletion) { + $data->completionsubmit=0; + } + if (empty($data->completionsubmit)) { + $data->completionsubmit=0; + } + } + + return $data; + } + + public function validation($data, $files) { + $errors = parent::validation($data, $files); + return $errors; + } + + public function add_completion_rules() { + $mform =& $this->_form; + + $mform->addElement('checkbox', + 'completionsubmit', + '', + get_string('completionsubmit', 'feedback')); + return array('completionsubmit'); + } + + public function completion_rule_enabled($data) { + return !empty($data['completionsubmit']); + } +} diff --git a/mod/feedback/pix/icon.gif b/mod/feedback/pix/icon.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/0.gif b/mod/feedback/pix/multichoice/0.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/1.gif b/mod/feedback/pix/multichoice/1.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/2.gif b/mod/feedback/pix/multichoice/2.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/3.gif b/mod/feedback/pix/multichoice/3.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/4.gif b/mod/feedback/pix/multichoice/4.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/5.gif b/mod/feedback/pix/multichoice/5.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/6.gif b/mod/feedback/pix/multichoice/6.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/7.gif b/mod/feedback/pix/multichoice/7.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/8.gif b/mod/feedback/pix/multichoice/8.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/multichoice/9.gif b/mod/feedback/pix/multichoice/9.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/notrequired.gif b/mod/feedback/pix/notrequired.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/pix/required.gif b/mod/feedback/pix/required.gif old mode 100644 new mode 100755 diff --git a/mod/feedback/print.php b/mod/feedback/print.php old mode 100644 new mode 100755 diff --git a/mod/feedback/settings.php b/mod/feedback/settings.php old mode 100644 new mode 100755 diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php old mode 100644 new mode 100755 diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php old mode 100644 new mode 100755 diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php old mode 100644 new mode 100755 diff --git a/mod/feedback/styles.css b/mod/feedback/styles.css old mode 100644 new mode 100755 diff --git a/mod/feedback/tabs.php b/mod/feedback/tabs.php old mode 100644 new mode 100755 diff --git a/mod/feedback/unmapcourse.php b/mod/feedback/unmapcourse.php old mode 100644 new mode 100755 diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php old mode 100644 new mode 100755 diff --git a/mod/feedback/use_templ_form.php b/mod/feedback/use_templ_form.php old mode 100644 new mode 100755 diff --git a/mod/feedback/version.php b/mod/feedback/version.php old mode 100644 new mode 100755 diff --git a/mod/feedback/view.php b/mod/feedback/view.php old mode 100644 new mode 100755 -- 1.7.9.5