82813 Commits

Author SHA1 Message Date
Dan Poltawski
3b2c5923f2 Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle 2017-01-09 08:27:18 +00:00
Dan Marsden
6c563ccedf MDL-45821 mod_scorm: Check lesson_status correctly for multi-sco. 2017-01-09 20:07:31 +13:00
Rajesh Taneja
5d2988fc8a
MDL-57595 behat: Added redirect and wait to ensure next step pass 2017-01-09 12:02:53 +08:00
AMOS bot
0d54830feb Automatically generated installer lang files 2017-01-08 00:04:47 +08:00
godric
4c4b966a92 MDL-40132 lib: Using compare rule results in fatal error.
In getValidationScript function variable $element can be an array or object.
Function attempt get non-existing attributes.
To avoid this we should check before accessing.
2017-01-07 09:40:27 +03:00
wehr
9c860cea46 MDL-57572 cache: Adds igbinary serializer to Redis cache store 2017-01-06 16:26:43 +01:00
John Okely
b7c822a546 MDL-57282 behat: Deprecate I go to X in the course gradebook 2017-01-06 13:47:19 +08:00
Dan Poltawski
8ed0851a5e weekly release 3.3dev 2017-01-06 01:30:49 +00:00
Dan Poltawski
70d8808476 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-01-06 01:30:48 +00:00
Rajesh Taneja
484503da62
MDL-56211 behat: Add suite name to faildump path
If suite is not default then add suite name
to end of faildump file name
2017-01-06 09:18:52 +08:00
David Mudrák
82a8d0d21d MDL-57580 mod_assign: Fix the incorrect type of some input parameters
The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.
2017-01-05 17:39:36 +01:00
Davo Smith
255d3aaaed MDL-56449 mod_assign: fix formatting of group warnings 2017-01-05 15:30:09 +00:00
Dan Poltawski
7716be5ae8 Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle 2017-01-05 10:09:17 +00:00
Rajesh Taneja
d44f7e4623
MDL-56519 behat: Add gherkin lint to watch and startup 2017-01-05 16:02:00 +08:00
Dan Poltawski
e0d1efd896 Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle 2017-01-05 06:51:54 +00:00
Rajesh Taneja
1024f6d1ec
MDL-57531 behat: Set noreplyaddress to valid address
noreplyaddress should be a valid address, else
it will not be saved. For behat we don't send
email, so set it to noreply@example.com, to
avoid failing validation on localhost
2017-01-05 14:40:16 +08:00
David Mudrák
1882e6ecac MDL-57563 lang: Use the new newsitemsnumber wording in behat 2017-01-04 22:09:44 +01:00
Helen Foster
442879042c MDL-57563 lang: Merge English strings from the en_fix language pack 2017-01-04 22:03:08 +01:00
AMOS bot
47b0dc1f3b Automatically generated installer lang files 2017-01-05 00:04:57 +08:00
Dan Poltawski
b6f5e57e45 Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle 2017-01-04 13:29:10 +00:00
David Mudrák
7620746f67 MDL-57531 mail: Make validate_email return actual boolean as expected
It was discovered by unit tests that the return value is not a real
boolean as was intuitively expected and documented. To avoid potential
issues with the truthyness in the future, we explicitly cast the return
value to boolean now.
2017-01-04 13:16:07 +01:00
David Mudrák
61367eb639 MDL-57531 mail: Validate the sender's email address
The patch adds validation for the noreplyaddress setting variable, for
the explicit $replyto parameter and for the sender's email. In case of
misconfigured noreplyaddress setting, it falls back to the default
noreply address value. In case of invalid email in the user's record,
the email is not sent.

The patch also adds unit test for the value returned by the function
generate_email_processing_address() so that it can be considered as a
valid email, too.

This is supposed to significantly minimise the risk of exploiting the
vulnerability in PHPMailer's Sender field.
2017-01-04 12:35:19 +01:00
David Mudrák
066ec13585 MDL-57531 mail: Do not let admins set invalid email addresses
The noreply and support emails should always be valid.
2017-01-04 12:34:29 +01:00
Eloy Lafuente (stronk7)
41af8a5f90 Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle 2017-01-04 11:34:01 +00:00
David Mudrák
1af801be98 MDL-56225 mod_forum: Fix inability to edit attachments
The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.

There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.
2017-01-04 11:34:01 +00:00
David Monllao
9afc02742b Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-04 11:34:00 +00:00
David Monllao
36bbf71a65 MDL-57338 templates: Fix modal_cancel template name 2017-01-04 11:33:59 +00:00
Rajesh Taneja
af1b9b6924 MDL-57536 availability: Fixed css for clean theme 2017-01-04 11:33:59 +00:00
Dan Poltawski
c3e9e8bc3c Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle 2017-01-04 11:33:58 +00:00
Ankit Agarwal
a76b0b8b85 MDL-56992 core_scss: Don't allow invalid files to be included
We allow only .scss files so allow files to be included only and only if they end in .scss and they exist on server under theme directory.
2017-01-04 11:33:57 +00:00
Andrew Nicols
6528ec3505 MDL-56225 mod_forum: Remove unnecessary attributes from update 2017-01-04 11:33:57 +00:00
Davo Smith
e7f3fd59d4 MDL-56449 mod_assign: fuller description of group submission problems 2017-01-04 10:35:41 +00:00
Dan Marsden
e68cdceee3 MDL-49557 mod_scorm: optionally strip quotes. 2017-01-04 15:43:46 +13:00
Ankit Agarwal
c728b45904 MDL-57192 dml: Temporarily disable query logging during setup 2017-01-03 17:24:21 +05:30
Ankit Agarwal
c14fe2cb03 MDL-57192 dml: Support temporarily disabling query logs during setup 2017-01-03 17:24:21 +05:30
Dan Poltawski
2c814d2c5e Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle 2017-01-03 08:16:22 +00:00
Rajesh Taneja
f2e6dcba51
MDL-52168 behat: Select iframe in which text needs to be checked 2017-01-03 15:14:04 +08:00
Eloy Lafuente (stronk7)
0e5205d36c Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle 2017-01-03 02:34:58 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Rajesh Taneja
e989ff2d34
MDL-56519 behat: Re-organize rules matching order
re-ordered rules to match gherkin-lint readme
https://github.com/vsiakka/gherkin-lint#available-rules
2017-01-03 09:12:54 +08:00
Dan Poltawski
8b02e2d98c
MDL-56519 behat: Lint gherkin files 2017-01-03 09:12:54 +08:00
Rajesh Taneja
d15a44d6fb
MDL-55042 phpunit: Get sorted sections
Sometimes db doesn't return records in order
So enusre it is in order so that last record
doesn't have section equal 0. As section 0
can't be deleted.
2017-01-03 06:52:03 +08:00
Eloy Lafuente (stronk7)
2a3341c2dc Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle 2017-01-02 19:37:17 +01:00
Eloy Lafuente (stronk7)
06f33c6a86 Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle 2017-01-02 18:59:16 +01:00
Juan Leyva
91fff3914b MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS 2017-01-02 18:56:02 +01:00
Juan Leyva
5316e716e5 MDL-57536 availability: Document required selectors changes
MDL-55839 Introduced some changes in CSS selectors used by the form.js
file.

This caused contributed plugins to not work (javascript stop working)
when editing a module.
2017-01-02 18:50:54 +01:00
Eloy Lafuente (stronk7)
e7e1308cd4 Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle 2017-01-02 16:42:41 +01:00
Dan Poltawski
00e741af48 Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-02 12:35:11 +00:00
Dan Poltawski
241473ce2e Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle 2017-01-02 12:20:34 +00:00
Dan Poltawski
589449b81e Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle 2017-01-02 12:15:01 +00:00