Commit Graph

24767 Commits

Author SHA1 Message Date
Helen Foster 442879042c MDL-57563 lang: Merge English strings from the en_fix language pack 2017-01-04 22:03:08 +01: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
Eloy Lafuente (stronk7) 41af8a5f90 Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle 2017-01-04 11:34:01 +00:00
David Monllao 36bbf71a65 MDL-57338 templates: Fix modal_cancel template name 2017-01-04 11:33:59 +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
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
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
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) e7e1308cd4 Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle 2017-01-02 16:42:41 +01:00
Dan Poltawski 589449b81e Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle 2017-01-02 12:15:01 +00:00
Dan Poltawski 6dbe175454 Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle 2017-01-02 11:46:44 +00:00
David Monllao 7eeb375380 Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle 2016-12-29 10:44:01 +01:00
Dan Poltawski 9f85876247 MDL-57338 templates: fix missing example variables
From Davids review, thanks
2016-12-29 08:03:47 +00:00
David Monllao 125fa61a15 MDL-57471 forms: Removing unresolved conflict line 2016-12-29 08:54:36 +01:00
David Monllao 3655a459b4 Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle 2016-12-29 08:43:37 +01:00
David Monllao 7454d5fb37 Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle 2016-12-28 21:19:01 +00:00
Dan Poltawski 79be02bf8d Merge branch 'MDL-57417-master' of https://github.com/snake/moodle 2016-12-28 21:19:00 +00:00
David Monllao 564630322c Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle 2016-12-28 12:22:52 +01:00
David Monllao cc31be4ffc Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle 2016-12-28 11:45:34 +01:00
Dan Poltawski 66b68d631d Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle 2016-12-28 10:32:50 +00:00
Juan Leyva 879a8f56c9 MDL-57395 course: New Web Service core_course_get_updates_since 2016-12-28 11:24:40 +01:00
David Monllao f32ff507e2 Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle 2016-12-28 10:58:13 +01:00
Dan Poltawski 20ad9c7b4e Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle 2016-12-28 08:56:12 +00:00
Ankit Agarwal cd65ea6d60 MDL-57373 navigation: Fix course names in flat nav 2016-12-27 11:57:45 +05:30
Dan Poltawski 0e34e46fd0 MDL-56488 boost: validate scss settings for parsable scss
* Parses the scss and fails validation if a parse error is found

* Does not detect the situation when variables are not present - this
  would involve us parsing the entire tree and would be slow. It could
  also change over time, depending on whats defined in the scss
  from themes.

* Introduces a new admin_setting_scsscode to do this
2016-12-23 09:51:29 +00:00
Jake Dallimore c41883f0bb MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope 2016-12-23 08:40:17 +08:00
Dan Poltawski 2d29386c44 MDL-57338 templates: add missing example context 2016-12-22 12:50:37 +00:00
Dan Poltawski b4a65796cf MDL-57338 chart: add example context
And fix aria roles
2016-12-22 12:50:25 +00:00
Dan Poltawski 57378aac0b MDL-57472 javascript-static: remove fix_column_widths()
A bit of a hack applied nearly 12 years ago in
7979105c62
2016-12-22 12:22:15 +00:00
Dan Poltawski 2fa2ed50eb MDL-57471 forms: deprecate init_javascript_enhancement()
This was half-finished and only used for the smartselect enhancement. That
enhancement doesn't work with theme_boost and is better replaced just
using the searchableselector element.
2016-12-22 12:19:51 +00:00
Michael Aherne 1afea82da0 MDL-57080 completion: Update completion expected date on reset 2016-12-22 11:37:51 +00:00
Rajesh Taneja 3b7a351d69 MDL-57494 behat: Fixed tags and removed reset in after_scenario
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
2016-12-22 12:42:39 +08:00
David Mudrák 657fa9db9d MDL-57474 mailer: Make sure that our exlicit MessageID is trimmed
The new version of phpmailer shipped with Moodle 3.2 has added check
that the explicitly provided MessageID matches /^<.*@.*>$/.

Values coming from our overridden moodle_phpmailer::addCustomHeader()
had a whitespace at the start. So the requested value was not used as
the Message-ID header and the default phpmailer value was used.

As a result, forum posts threading was broken in email clients.
2016-12-21 01:20:52 +01:00
Dan Poltawski ce20d61aa7 MDL-44172 lib: remove example htaccess file
This is not being maintained and is outdated. Better handled in docs.
2016-12-20 14:33:27 +00:00
David Monllao d6db7a1d9a Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle 2016-12-20 11:09:39 +01:00
Dan Poltawski 3f56d612ec MDL-56640 templates: add example content 2016-12-20 10:02:06 +00:00
Dan Poltawski d83d87f6ac MDL-56640 yui: remove moodle-core-formautosubmit
It's easily achieved with jquery primatives
2016-12-20 10:02:06 +00:00
Dan Poltawski 588b84f78a MDL-56640 js: yui to jquery for formautosubmit in select templates
I did not keep the 'nothing' behaviour in the js because I don't think
the nothing option needs special handling, given that its default
selection.
2016-12-20 10:02:05 +00:00
Adrian Greeve 920edec857 MDL-57251 navigation: Correct permission shows site admin
If the user does not have the moodle/site:configview
capability then do not show them the site administration
link.
2016-12-20 12:51:51 +08:00
Adrian Greeve b1eb88a4e0 MDL-57251 administration: Updated coursecreator role.
The coursecreator role now has the moodle/site:configview
capability so that they have access to the required admin
pages.
2016-12-20 12:51:51 +08:00
Dan Poltawski caf52b578b Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle 2016-12-19 15:46:54 +00:00
David Monllao ef9a1a2aff Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle 2016-12-19 15:05:14 +01:00
Dan Poltawski c67e93b235 MDL-56640 templates: move select templates from boost to core 2016-12-19 12:23:54 +00:00
Eloy Lafuente (stronk7) e857608ba2 Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle 2016-12-19 13:02:09 +01:00
David Monllao a127f448f0 Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle 2016-12-19 12:54:04 +01:00
Dan Poltawski 89556019c0 MDL-57450 enviroment: remove tls library check
Unfortunately it has come to light that the version sniffing is just not
reliable at all, operating system vendors backport security patches to
older versions - so in many cases we reporting a problem which is not a
problem. False positives and the solution to self-compile or something
like php will be causing more harm than good.
2016-12-19 10:55:07 +00:00