Compare commits

..

549 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 0bd0ee444a Moodle release 3.0.10 2017-05-07 21:32:44 +02:00
Marina Glancy 887f2449a2 MDL-58740 block_course_overview: check session key
Thanks to Kukas Schmidt for initial patch
2017-05-04 08:56:01 +08:00
Marina Glancy 40adce7f08 MDL-58670 blog: respect capability to search entries 2017-05-04 08:56:00 +08:00
Marina Glancy 27795d1eed MDL-58635 blogs: check edited blog belongs to current user 2017-05-04 08:56:00 +08:00
David Monllao 5743df7428 weekly release 3.0.9+ 2017-05-03 10:27:40 +08:00
Andrew Nicols c31d886c8f MDL-58746 core: Simplify environment check 2017-05-03 08:37:05 +08:00
Andrew Nicols 943c9c3c9a MDL-58746 core: Add environment check for finfo 2017-05-01 13:23:46 +08:00
Eloy Lafuente (stronk7) 6b2d3d3e6a MDL-54901 environment: pg93 & openssl 2017-04-18 04:04:52 +02:00
Eloy Lafuente (stronk7) a8b89c6120 MDL-54901 environment: 3.3 base information
This is a direct copy of the 3.2 branch to
have changes under control easier in next commits.
2017-04-18 03:06:29 +02:00
Eloy Lafuente (stronk7) cbfee05d7f Moodle release 3.0.9 2017-03-11 22:15:54 +01:00
Marina Glancy 0833e7cfc7 MDL-58010 user: allow to update only whitelisted preferences 2017-03-10 18:10:44 +00:00
Eloy Lafuente (stronk7) 10d80cd64c weekly release 3.0.8+ 2017-01-27 00:27:49 +01:00
Dan Poltawski 024f0b702a Merge branch 'MDL-57639-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2017-01-24 10:11:26 +00:00
Dan Poltawski 68529165cd Merge branch 'MDL-57677-30-usermodified' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2017-01-23 09:49:49 +00:00
Andrew Nicols 87f6a483c3 MDL-57639 mod_forum: Update to use correct variable name
This addresses a regression where unnecessary attributes were removed
from the old variable. This one was missed.
2017-01-19 14:01:37 +08:00
David Mudrák c4fabc91e1 MDL-57677 mod_forum: Fix wrong user displayed as the last post's author
In the recent issue MDL-56225, we started to record the current user as
the usermodified in the forum_discussions table when updating a forum
post. It made sense but it was a mistake.

Even if the current user really modifies the discussion by updating the
post, the field usermodified has actually been always interpreted and
displayed as the last post' author. Not as the last user who touched the
discussion.

This patch reverts that particular change to the previous behaviour and
adds explicit unit test for it.
2017-01-17 20:07:54 +01:00
Eloy Lafuente (stronk7) 25c75f9b99 Moodle release 3.0.8 2017-01-08 11:04:22 +01:00
Eloy Lafuente (stronk7) 517cc1f9a7 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2017-01-08 11:04:18 +01:00
David Mudrák 00e928271b 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:40:26 +01:00
Rajesh Taneja 824965d5dc 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 06:53:23 +00:00
David Mudrák ae375cfcdc 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 13:35:07 +00:00
David Mudrák 1c25f894ef MDL-57531 mail: Do not let admins set invalid email addresses
The noreply and support emails should always be valid.
2017-01-04 13:34:09 +00:00
David Mudrák ef7442df5b 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 10:36:40 +00:00
Andrew Nicols a1fadacb86 MDL-56225 mod_forum: Remove unnecessary attributes from update 2017-01-03 16:58:33 +00:00
AMOS bot 8f6cefd57d Automatically generated installer lang files 2016-12-08 00:05:43 +08:00
Dan Poltawski f7b04c388e weekly release 3.0.7+ 2016-12-02 15:18:06 +00:00
Dan Poltawski a6ec5b6ff6 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-12-02 15:18:05 +00:00
Eloy Lafuente (stronk7) 589c0fbd88 Merge branch 'MDL-57193-30-notest' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE 2016-12-02 11:41:25 +01:00
Frederic Massart fe5264217d MDL-57193 auth_db: Flip the array outside the loop for better perf
Also as the recent changes where affecting the whitespaces quite
a lot, I took the liberty of aligning a few lines which weren't.
2016-12-02 16:30:17 +08:00
John Okely fdaea8ad64 MDL-57193 auth_db: Use a recordset and array_key_exists 2016-12-02 16:30:17 +08:00
Josh Willcock 4f22f01fe4 MDL-57193 auth_db: Fixed bug suspends all users if external DB has > 10k 2016-12-02 16:30:17 +08:00
AMOS bot 842db4fd37 Automatically generated installer lang files 2016-12-01 00:06:02 +08:00
AMOS bot f2066cb88f Merge branch 'MOODLE_30_STABLE' into install_30_STABLE 2016-12-01 00:06:02 +08:00
AMOS bot 0ae9cfc1c2 Automatically generated installer lang files 2016-11-30 00:05:00 +08:00
Dan Poltawski 8dfbc3a822 weekly release 3.0.7+ 2016-11-29 13:32:27 +00:00
Dan Poltawski 6c0d5df3a2 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-11-29 13:32:25 +00:00
David Monllao fb92dba76f Merge branch 'MDL-57163-30' of https://github.com/vvzh/moodle into MOODLE_30_STABLE 2016-11-29 11:43:31 +08:00
Tim Lock b80b3d0237 MDL-57170 repository_dropbox: Ensure Dropbox Legacy continues to work 2016-11-28 10:31:31 +08:00
Vladimir Zhirov a0f554f012 MDL-57163 installation: fixed "Call to undefined function curl_version" 2016-11-27 12:13:53 +04:00
AMOS bot 44c7ab2121 Automatically generated installer lang files 2016-11-27 00:06:05 +08:00
AMOS bot 8690bb8068 Merge branch 'MOODLE_30_STABLE' into install_30_STABLE 2016-11-26 00:04:47 +08:00
David Monllao 60b566037a weekly release 3.0.7+ 2016-11-25 15:56:29 +08:00
Tony Butler 7d6c55bfc1 MDL-56948 mod_assign: Don't call get_grade_item() unless we have one 2016-11-24 15:58:44 +00:00
Damyon Wiese 1cf01e8add MDL-57100 JS: Exceptions give exceptions
Exceptions returned from ajax are not in the format expected by the JS, so
an error occurs and the exception popups are not appearing.

Conflicts:
	lib/amd/build/notification.min.js
	lib/amd/src/notification.js
2016-11-23 18:08:17 +00:00
AMOS bot dd9f8fae09 Automatically generated installer lang files 2016-11-23 00:05:30 +08:00
AMOS bot 2a3c0ef415 Automatically generated installer lang files 2016-11-18 00:07:02 +08:00
AMOS bot c6135d8d46 Automatically generated installer lang files 2016-11-17 00:04:55 +08:00
Eloy Lafuente (stronk7) ca86a178c8 Moodle release 3.0.7 2016-11-12 20:21:29 +01:00
AMOS bot 9b94006603 Automatically generated installer lang files 2016-11-12 00:29:19 +08:00
Dan Poltawski 65eb6bd459 weekly release 3.0.6+ 2016-11-11 12:05:49 +00:00
Andrew Nicols 8ae126d9b3 Merge branch 'MDL-55121-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-11-11 15:13:52 +08:00
Andrew Nicols 9b6313b0b7 Merge branch 'MDL-55994_30' of https://github.com/bostelm/moodle into MOODLE_30_STABLE 2016-11-11 14:00:24 +08:00
Andrew Nicols 9381d3e9ca Merge branch 'MDL-56417_30' of https://github.com/dmonllao/moodle into MOODLE_30_STABLE 2016-11-11 12:00:23 +08:00
Andrew Nicols 747225192f Merge branch 'MDL-52216_30_STABLE' of https://github.com/eugeneventer/moodle-fixes into MOODLE_30_STABLE 2016-11-11 11:22:51 +08:00
Simey Lameze 9c802cf1d4 MDL-55121 environment: check for unsuported php version 7.1 2016-11-11 10:02:21 +08:00
Eugene Venter c29df134e7 MDL-52216 mod_lesson: prevent invalid view modes 2016-11-11 09:26:29 +13:00
Henning Bostelmann 0c8a667aa9 MDL-55994 blog: Resolve warning messages in RSS feed generation 2016-11-10 16:33:58 +00:00
Dan Poltawski 0d593bd003 Merge branch 'MDL-56623_30-messages-to-adressed-to-until' of git://github.com/lucaboesch/moodle into MOODLE_30_STABLE 2016-11-10 15:04:35 +00:00
Dan Poltawski 0dd5c403cb Merge branch 'MDL-55249_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-11-10 15:01:44 +00:00
Dan Poltawski a788beadce MDL-55777 version: bump 2016-11-10 13:48:16 +00:00
Dan Poltawski db7bb6eae5 Merge branch 'MDL-55777-30' of git://github.com/ankitagarwal/moodle into MOODLE_30_STABLE 2016-11-10 13:46:47 +00:00
Eloy Lafuente (stronk7) cda80862da Merge branch 'MDL-53481-30-uniqsqlparam' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-11-10 13:16:06 +01:00
Luca Bösch 6006cd746a MDL-56623 messages: To (addressed) and to (until) different
In some languages "to" having the meaning of "until" and "to" having the meaning of "addressed to" are different.
This should be taken care of by having two different translation terms.

AMOS BEGIN
  CPY [to,core],[addressedto,core]
AMOS END
2016-11-10 11:13:05 +01:00
David Mudrák 93ccd9a8ed MDL-53481 availability: Fix unit test to not execute the huge query
Some DBs have troubles to execute such a huge query as generated in this
test. We do not actually need to execute it. All we need is to make sure
that the parameter placeholders are enumerated correctly. So it is what
this new test does.
2016-11-10 09:55:59 +01:00
Nicholas Hoobin 5e1b84ae0e MDL-56417 session: Respect the return value of ignore_timeout_hook. 2016-11-10 14:25:55 +08:00
Ankit Agarwal 20a03b8085 MDL-55777 installation: Check libcurl version on install 2016-11-10 10:21:58 +05:30
Juan Leyva 388b48ebcd MDL-56268 webservice: Format backtrace to avoid display private datawq 2016-11-10 11:41:24 +08:00
Simey Lameze 317bcee9e4 MDL-51347 core_notes: check view notes capability by course context 2016-11-10 11:41:24 +08:00
Tim Hunt 75ed173bac MDL-53744 question file access: fix access checks 2016-11-10 11:41:24 +08:00
Juan Leyva 396f819ce7 MDL-56065 user: Fix update_users Web Service
Users won’t be updated if:
- They are admins and the user updating is not
- They are the guest user
- They are mnet users
- They are deleted users
2016-11-10 11:41:24 +08:00
David Monllao fc701cb3a2 Merge branch 'MDL-56753-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-11-10 11:39:15 +08:00
Simey Lameze 50a9aa3202 MDL-56753 mod_assign: behat tests for groups and grouping counting 2016-11-10 11:18:18 +08:00
Simey Lameze 7733c75210 MDL-56753 mod_assign: fix groups and submitted counting on grading summary
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
2016-11-10 11:18:18 +08:00
Andrew Nicols 1d0df063a9 Merge branch 'MDL-55883_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-11-10 11:14:28 +08:00
Andrew Nicols 8faca311f1 Merge branch 'MDL-56755-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE 2016-11-09 15:45:26 +08:00
Andrew Nicols fd8435ce92 Merge branch 'MDL-56726-30-cfgadmin' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-11-09 14:52:59 +08:00
David Monllao 4165507baf Merge branch 'MDL-56133-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE 2016-11-09 14:24:21 +08:00
David Monllao e2d1844913 Merge branch 'MDL-53481-30-uniqsqlparam' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-11-09 12:50:20 +08:00
David Mudrák 688a698dc2 MDL-53481 availability: Fix uniqueness of SQL named param placeholders
Static variables do not behave the way you might expect when accessing
them through the classes inheritance. When accessing a method via self::
or static:: operators, even though the method is inherited, its variable
scope is not. So the method unique_sql_parameter() was using the scope
of the child class and each child class had its own sequence of usp1,
usp2, usp3, ... placeholders. This led to "Incorrect number of query
parameters" error when multiuple condition classes were contributing to
a single SQL query.

All credit should go to Adam Olley who debugged and described the
essence of the problem in the tracker.
2016-11-08 14:24:45 +01:00
Neill Magill 4152d926af MDL-56133 tool_langimport: Changes should be visible after import
Before this change if a language pack was updated by the
\tool_langimport\task\update_langpacks_task scheduled task, changes
would not be available to users until an admin manually cleared the
strings cache.

This change causes the cache to purged when a language pack it update,
this will cause it to rebuild so users will start seeing updates
automatically.
2016-11-08 10:55:48 +00:00
Dan Poltawski 218d1f0276 weekly release 3.0.6+ 2016-11-08 10:16:36 +00:00
Dan Poltawski 1b2ae4d7d3 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-11-08 10:16:35 +00:00
Michael Aherne 6ff83aa7e4 MDL-56755 assign: Improve documentation of assign::get_grade_item() 2016-11-08 09:04:25 +00:00
Andrew Nicols ab44e17338 Merge branch 'wip-MDL-56120-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-11-08 10:50:31 +08:00
David Monllao 8791b78091 Merge branch 'MDL-53718_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE 2016-11-08 10:00:01 +08:00
Adrian Greeve a7f71822ff MDL-56120 calendar: Unit tests for getting events.
Added a unit test for checking that calendar_get_events
will only return events for activated activities.
2016-11-08 08:35:34 +08:00
Adrian Greeve 78303a974d MDL-56120 calendar: Fix disabled modules showing events.
calendar_get_events now checks for disabled activities
and only shows evetns for active modules.
2016-11-08 08:34:36 +08:00
Eloy Lafuente (stronk7) b9f81ce7cb Merge branch 'MDL-56765-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE 2016-11-08 01:27:58 +01:00
Russell Smith 12abdd7cbc MDL-54916 filestorage: Only write empty zip on change.
In some cases we may inspect an empty zip file. If we do open
an empty zip file, check that it changed before we attempt to write
it to disk.  It may be the case that we were reading the file from
a location that we don't have write access to.
2016-11-07 16:20:48 +01:00
Adam Olley a85576bf1a MDL-53718 badges: Dont display course badges when disabled 2016-11-07 15:58:23 +10:30
David Monllao eee689975a Merge branch 'MDL-56129-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-11-07 11:16:34 +08:00
David Monllao c641721530 Merge branch 'MDL-56731_30_STABLE' of https://github.com/tonynlin/moodle into MOODLE_30_STABLE 2016-11-07 10:45:22 +08:00
Jonathon Fowler 2688f5a4a9 MDL-56129 core: Change HTTP error code for iOS 10 video playback
This patch changes the effective response code from a 407 to a 403 when
erroring on iOS 10 and when a HTTP_X_PLAYBACK_SESSION_ID HTTP header is
found.

This causes the iOS Media framework to send the cookie with the request
which subsequently succeeds.
2016-11-07 10:01:45 +08:00
AMOS bot 4ccd9811d4 Automatically generated installer lang files 2016-11-07 00:05:02 +08:00
Juan Leyva f17db49ec6 MDL-56765 webservice: After a new session is started unset old preferences 2016-11-04 19:16:28 +00:00
Dan Poltawski 1642ba1ea3 Merge branch 'wip-MDL-54986-30' of https://github.com/Beedell/moodle into MOODLE_30_STABLE 2016-11-04 14:31:19 +00:00
Dan Poltawski fbbe6c88d6 Merge branch 'MDL-53945_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE 2016-11-04 14:07:27 +00:00
Tony Lin 8d68bbd484 MDL-56731 groups: Fixes breadcrumb when returning to groups/index.php 2016-11-04 13:28:31 +00:00
Dan Poltawski 07f06046e3 weekly release 3.0.6+ 2016-11-04 11:17:55 +00:00
Dan Poltawski 32f556dda0 MDL-56673 tool_templatelibrary: fix externallib backwards compat
The function now matches the VALUE_DEFAULT option of the service.
2016-11-04 11:45:29 +01:00
Jun Pataleta efec93b8e8 MDL-46903 mod_scorm: Apply alias to compare text column 2016-11-04 14:24:07 +08:00
Andrew Nicols d556156427 Merge branch 'MDL-56673-30-fix1' of http://github.com/damyon/moodle into MOODLE_30_STABLE 2016-11-04 14:10:13 +08:00
Damyon Wiese 5644de2d37 MDL-56673 tool_templatelibrary: Don't show templates from other themes 2016-11-04 14:07:18 +08:00
David Monllao 3d9ed4ae61 Merge branch 'MDL-56748-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-11-04 13:45:49 +08:00
Andrew Nicols c5dd7b71da MDL-56748 cache: Removes cache definition instances in purge_store
Previously a purge_store was only purging caches but it was leaving a
reference to the store instance for the cache definition.

As a result, the cache was never cleared away correctly and, in cases
where the cache store makes a TCP connection to a backend system, the
number of open sockets was increasing for each store instance.

After a complete purge, as found in the unit test reset, the cache
definitions should be both purged and removed.

This change should also lead to a drop in memory consumption for unit
tests as there will no longer be references to unused definition stores.
2016-11-04 13:45:10 +08:00
David Monllao d8ff21935d Merge branch 'mdl30_MDL-46903' of https://github.com/danmarsden/moodle into MOODLE_30_STABLE 2016-11-04 08:25:04 +08:00
Adam Olley 1454c203a9 MDL-53945 mnet: Use moodle_url to provide string with url
Using moodle_url where possible is preferable to hardcoding uri's as
moodle_url is able to take care of alot of the formatting for us.

In this instance, it handles the $CFG->admin url path for us.
2016-11-04 09:13:24 +10:30
Adam Olley 3cc3a80a27 MDL-53945 mnet: replace hardcoded admin dir with cfg
Several places in admin/mnet pull in required files using a hardcoded
admin dir string, as this is configurable it needs to use $CFG->admin
instead.

Places where the url is passed through moodle_url don't need to be
updated as that already automatically translates the urls for us.
2016-11-04 09:13:23 +10:30
David Mudrák 820d389575 MDL-56726 admin: Fix hard-coded path to the admin directory 2016-11-03 10:18:45 +01:00
John Beedell 7c882f4389 MDL-54986 Quiz: Disable add button for quiz with attempts 2016-11-03 09:11:15 +00:00
Dan Marsden 7540ee5e5e MDL-46903 scorm: Fix db error in objectives report for oracle.
also improve 2004 report handling to help with testing.
2016-11-03 21:20:57 +13:00
Andrew Nicols dbda3be673 Merge branch 'MDL-56634-30' of git://github.com/ankitagarwal/moodle into MOODLE_30_STABLE 2016-11-02 14:05:28 +08:00
David Monllao 0b69e31402 Merge branch 'MDL-56323-30' of git://github.com/l-campbell/moodle into MOODLE_30_STABLE 2016-11-02 13:12:29 +08:00
Ankit Agarwal cd9927ac9f MDL-56634 webservices: clean api desc 2016-11-02 10:04:16 +05:30
David Monllao 9e4c960c39 Merge branch 'MDL-43796_30_blindmarking' of https://github.com/SWiT/moodle into MOODLE_30_STABLE 2016-11-02 12:29:14 +08:00
Andrew Nicols 8b2fb6720c Merge branch 'MDL-56673-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE 2016-11-02 12:16:28 +08:00
Stephen Bourget b25dab817e MDL-55883 mod_lesson: Missing include in lesson_update_events 2016-11-01 21:21:36 -04:00
Stephen Bourget 82907dc43b MDL-55249 mod_feedback: Associate status with current activity
The status screen in mod_feedback simply checks to see if there are any
attempts in progress to return the user status.  This check should be
limited to only include instances of the current feedback activity not
any feedback activity on the site.
2016-11-01 21:17:04 -04:00
Dan Poltawski 7c889e2f08 Merge branch 'MDL-54112-30' of https://github.com/hcpss-banderson/moodle into MOODLE_30_STABLE 2016-11-01 21:31:06 +00:00
Dan Poltawski 8976674370 Merge branch 'mdl30_MDL-47500' of git://github.com/danmarsden/moodle into MOODLE_30_STABLE 2016-11-01 21:29:34 +00:00
Dan Poltawski 99b8d0a69d Merge branch 'mdl55456-moodle30' of https://github.com/tlock/moodle into MOODLE_30_STABLE 2016-11-01 21:27:51 +00:00
Brian Barnes 468d2770c5 MDL-47500 scorm: improved height calculation 2016-11-02 08:45:43 +13:00
Eloy Lafuente (stronk7) 2ce1d2c71b weekly release 3.0.6+ 2016-11-01 19:48:05 +01:00
Dan Poltawski 3fe2093f3b MDL-56673 templatelibrary: return false when core template doesn't exist 2016-11-01 10:19:28 +00:00
Marina Glancy 9273b920e5 MDL-56615 portfolio_googledocs: add basic unittests 2016-10-31 20:35:20 +01:00
Marina Glancy 03e398154c MDL-56615 portfolio: fix php 7.0.9 warning 2016-10-31 20:34:45 +01:00
Dan Poltawski fdac7064c2 Merge branch 'MDL-56542-30-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-10-31 15:13:56 +00:00
Brendan Anderson b6ed8fdf5f MDL-54112 mod_assign: Add scale null grade filter 2016-10-27 10:09:03 -04:00
Dan Poltawski 84f1341162 weekly release 3.0.6+ 2016-10-27 12:19:32 +01:00
Dan Poltawski 6be87e8003 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-10-27 12:19:31 +01:00
Dan Poltawski 25f472d2a0 Revert "Merge branch 'MDL-56129-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE"
This reverts commit bff2510df9, reversing
changes made to e40c822a58.
2016-10-27 10:05:36 +01:00
Eloy Lafuente (stronk7) 232178eca2 Merge branch 'MDL-56354-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-10-26 01:05:51 +02:00
Russell Smith ca99df58e2 MDL-56354 unittests: Put debug messages in the failure notice. 2016-10-26 09:27:01 +11:00
Dan Poltawski 26d01a4e56 Merge branch 'MDL-56136_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-10-25 20:44:36 +01:00
Eloy Lafuente (stronk7) 617528c5ae Merge branch 'MDL-56250-30-formvalidation' of https://github.com/roperto/moodle into MOODLE_30_STABLE 2016-10-25 20:30:47 +02:00
Helen Foster cba517e826 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:28:40 +02:00
Eloy Lafuente (stronk7) 0fed28f9c9 Merge branch 'MOODLE_30_STABLE' of https://github.com/yuriy-os/moodle into MOODLE_30_STABLE 2016-10-25 20:00:28 +02:00
Dan Poltawski caf74fff01 Merge branch 'MDL-55143-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-10-25 18:39:20 +01:00
AMOS bot 3e2295f008 Automatically generated installer lang files 2016-10-26 00:04:49 +08:00
David Monllao 9bfd78bafc Merge branch 'wip-mdl-56347-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-10-25 15:20:29 +08:00
Russell Smith 0dc04c49bd MDL-56347 caching: Better class variables for notices. 2016-10-25 09:53:49 +08:00
Rajesh Taneja dd705dd7ff MDL-56347 phpunit: Set class for alternative cache store
If alternative cache store is sued, then set the class
and warn user about this.
2016-10-25 09:53:28 +08:00
lazydaisy 91c9d79227 MDL-48350 theme_bootstrapbase: restyle action icons in docked blocks 2016-10-24 21:39:16 +02:00
Dan Poltawski e9f7b1bcc5 Merge branch 'wip-MDL-56439-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-10-24 14:34:11 +01:00
Lee Campbell 811856d064 MDL-56323 core_user: User profile field default value not on signup page
The default value of a configured text input user profile field is not rendering on signup page
2016-10-24 09:34:22 +01:00
David Monllao bff2510df9 Merge branch 'MDL-56129-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-10-24 12:01:19 +08:00
Andrew Nicols 638b683ac5 MDL-56129 core: Set a timeout on the session cookie
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.

In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.

Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.

This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
2016-10-24 11:48:06 +08:00
Frédéric Massart e40c822a58 MDL-56341 mustache: JS engines handles strings wrapped in quote
Prior to the patch the strings wrapped as the following one
where not found and replaced when rendering the template via Javascript

{{#quote}}{{#str}}string,component{{/str}}{{/quote}}
2016-10-24 10:09:52 +08:00
Yuriy Osychenko b45bc1d389 MDL-53098 lib: Mark form as submitted in confirmation dialog.
If the quiz attempt use popup window with Javascript security it will
show to the user misleading message that he is going to lose entered
data.
To avoid this we should mark form as submitted to turn off browser`s
pop-up window when user confirms finishing attempt.
Also we need to check if core_formchangechecker is present on a page.
2016-10-24 00:43:27 +03:00
Daniel Thee Roperto 511b478297 MDL-56250 forms library: Changed form to validate once per object.
If two instances of moodleforms are validated in the same run, most
likely a phpunit test run, it would store the first validation result.
Now it stores the validation result per instance, not for all instances.
2016-10-21 10:38:47 +11:00
Eloy Lafuente (stronk7) 3d13576463 weekly release 3.0.6+ 2016-10-20 17:52:41 +02:00
Eloy Lafuente (stronk7) bf7e998500 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-10-20 17:52:37 +02:00
Andrew Nicols 6fdcba2544 Merge branch 'MDL-56328_30-fix-rtl' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE 2016-10-19 13:30:37 +08:00
David Monllao 7f5f314977 MDL-56328 theme: Remove RTL styles
They should only be applied while editing mode is on
2016-10-19 12:43:29 +08:00
Eloy Lafuente (stronk7) 8d6eaed3b7 Merge branch 'MDL-29774-30-by-sam-wilson' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-10-18 17:34:56 +02:00
Andrew Nicols e904f8c075 MDL-55858 mod_forum: Remove subscription links when not relevant
When a forum is force-subscribed or subscription is disabled, do not
include the subscription link in forum posts.
2016-10-18 17:01:13 +02:00
Dan Poltawski 9f4f53f699 Merge branch 'MDL-56131-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-10-18 13:44:41 +01:00
Dan Poltawski 02cba0b682 Merge branch 'MDL-56062-30' of https://github.com/lucisgit/moodle into MOODLE_30_STABLE 2016-10-18 12:06:59 +01:00
Eloy Lafuente (stronk7) f9d95d9ed9 Merge branch 'MDL-56275-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE 2016-10-18 12:13:25 +02:00
Dan Poltawski 26bf333277 MDL-56275 blog: do not display the 'choose a link' button
When registereing an external blog the choose a link button is
misleading, we don't have any repos which restrict to RSS feeds, so the
majority of results you get from the repo picker will be wrong.
2016-10-18 11:09:14 +01:00
David Monllao 48bc44477d Merge branch 'MDL-56328-M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE 2016-10-18 16:08:00 +08:00
Eloy Lafuente (stronk7) 959cb13aad Merge branch 'MDL-56345-30' of https://github.com/lucisgit/moodle into MOODLE_30_STABLE 2016-10-18 09:38:57 +02:00
Tim Lock 533e6018c6 MDL-55456 course: set context for category ajax requests 2016-10-18 12:51:54 +10:30
Sam Wilson 89b8a5c82f MDL-29774 core_user: Update group-membership summaries on AJAX calls 2016-10-18 09:36:09 +08:00
Eloy Lafuente (stronk7) b7108061a4 Merge branch 'wip-mdl-56348-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-10-18 01:10:41 +02:00
Russell Smith 49235cdd85 MDL-55143 unittests: Check the db rather than cache for version hash. 2016-10-18 09:53:38 +11:00
Eloy Lafuente (stronk7) a1e14a55db Merge branch 'MDL-56368-M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE 2016-10-18 00:38:59 +02:00
Michael Aherne 0822adfe49 MDL-56131 choice: Set maximum lifetime for lock 2016-10-17 13:51:22 +08:00
AMOS bot 4079f3ad90 Automatically generated installer lang files 2016-10-17 00:06:59 +08:00
Matthew Switlik b90aa9570a MDL-43796 assign: Reset revealidentities on restore
Set revealidentities to 0 when restoring, importing, or duplicating an
assignment activity with blindmarking on and no user data.
2016-10-14 14:22:33 -04:00
AMOS bot ea69caa2d6 Automatically generated installer lang files 2016-10-15 00:04:57 +08:00
lazydaisy c5b6b52432 MDL-56368 theme_bootstrapbase: Settings for Restrict Access not inline. 2016-10-14 15:55:12 +01:00
lazydaisy 3de493704b MDL-56328 theme_bootstrapbase: reduce activity indent when not editing 2016-10-14 15:27:05 +01:00
Marina Glancy e6885a4e71 MDL-56439 course: added missing require 2016-10-14 08:21:29 +08:00
Eloy Lafuente (stronk7) 3292e36a21 weekly release 3.0.6+ 2016-10-13 20:02:28 +02:00
Eloy Lafuente (stronk7) f330c27f67 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-10-13 20:02:25 +02:00
Eloy Lafuente (stronk7) 3ac6d35915 Merge branch 'MDL-56319-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE 2016-10-13 19:47:02 +02:00
Tony Butler f83d4ceb24 MDL-56345 assignfeedback_editpdf: Use correct strings for tool alt text 2016-10-13 10:09:17 +01:00
Tony Butler 003699dba4 MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display 2016-10-12 20:57:41 +01:00
AMOS bot 5ac7b30bd3 Automatically generated installer lang files 2016-10-12 00:05:16 +08:00
Paul Holden 6ce2b2b141 MDL-55345 user: correct userid when linking to iplookup from profile 2016-10-11 17:06:54 +02:00
Janek Lasocki-Biczysko 81c5d47c2a MDL-51401 enrol: ensures correct order of roles in UI components
Role sort order was not available in the UI (in JavaScript) due to
the use of PHP assoc arrays and JSON encoding/decoding. This patch
addresses this by sending the roles in a json array, rather than
json object.
2016-10-11 18:01:56 +08:00
David Monllao 6d9c397d37 Merge branch 'MDL-52051-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-10-11 17:11:58 +08:00
Dan Poltawski 61a12d418e Merge branch 'MDL-36611-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-10-11 08:53:49 +01:00
Rajesh Taneja 67a20af671 MDL-56348 cache: Removed second parameter
There is no second parameter in the api
and identifier should be set by set_identifiers
2016-10-11 12:51:58 +08:00
Andrew Nicols a107243c61 MDL-52051 repository_dropbox: Add the V2 API 2016-10-11 11:45:44 +08:00
Kirill Astashov aa8d361b83 MDL-36611 outcome: Set page context when editing outcome 2016-10-11 10:02:01 +08:00
Eloy Lafuente (stronk7) 46da0ff5a5 Merge branch 'MDL-56220-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE 2016-10-11 01:18:50 +02:00
Eloy Lafuente (stronk7) 36eebecef6 Merge branch 'MDL-56316-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-10-10 18:18:41 +02:00
Eloy Lafuente (stronk7) bc6a3998b9 Merge branch 'MDL-51633_M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE 2016-10-10 17:49:10 +02:00
Simey Lameze 0fd4fe4fb3 MDL-56050 core: set missing context to maintenance mode 2016-10-10 23:15:28 +08:00
Andrew Nicols 015729e746 MDL-52051 repository_dropbox: Move v1 API aside 2016-10-10 20:34:13 +08:00
Andrew Nicols 72de799d7b MDL-52051 oauth: expires_in is optional 2016-10-10 20:34:13 +08:00
Dan Poltawski 30078d7b9d Merge branch 'MDL-51584-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-10-10 13:27:05 +01:00
Dan Poltawski 5de9f1c0d3 Merge branch 'MDL-55597-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE 2016-10-10 11:33:15 +01:00
Michael Aherne ce4ef5bd79 MDL-56319 blocks: Observe empty default blocks setting 2016-10-10 09:55:21 +01:00
Russell Smith dbff7477aa MDL-51584 gradebook: use direct $CFG access for freeze.
get_config() is called a lot of times on freeze and is expensive,
using $CFG is much lower overhead.
2016-10-10 15:43:22 +11:00
AMOS bot c02fd57da7 Automatically generated installer lang files 2016-10-09 00:06:33 +08:00
lazydaisy 8a5e17b2e1 MDL-51633 theme_bootstrapbase: Restyled ADD BLOCK to remove max-width. 2016-10-07 18:58:18 +01:00
AMOS bot f608a42e09 Automatically generated installer lang files 2016-10-08 00:05:07 +08:00
Frédéric Massart 6da1369913 MDL-55597 tool_templatelibrary: Re-inforce logic to skip theme templates 2016-10-07 10:44:40 +02:00
Andrew Nicols ef8da7069e MDL-56316 tests: Ensure consistent assertion count 2016-10-07 14:46:30 +08:00
Eloy Lafuente (stronk7) 7223cd2518 weekly release 3.0.6+ 2016-10-06 22:31:34 +02:00
Dan Poltawski 4be702669b MDL-56303 quiz: lack of quiz filtering
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
2016-10-06 22:20:09 +02:00
Eloy Lafuente (stronk7) 98648c4242 weekly release 3.0.6+ 2016-10-06 11:51:37 +02:00
Eloy Lafuente (stronk7) cc59a3e2af Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-10-06 11:51:33 +02:00
Dan Poltawski 075f978ba2 Merge branch 'MDL-54802-30-fix-2' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-10-05 14:33:53 +01:00
Cameron Ball 331613ddb1 MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade
When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.
2016-10-05 19:32:13 +08:00
Dan Poltawski 41d5e39323 Merge branch 'MDL-54802-30-fix' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-10-05 10:33:52 +01:00
Cameron Ball 7455f7d100 MDL-54802 mod_quiz: Move grade to pass error to require passing grade element
When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.

Additionaly this patch fixes a small typo in a comment.
2016-10-05 17:17:56 +08:00
Rajesh Taneja 7d36214618 MDL-56210 behat: Pending and complete js is added by js_init_code 2016-10-05 15:46:51 +08:00
Eloy Lafuente (stronk7) a231d66dec Merge branch 'MDL-56231-30-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle into MOODLE_30_STABLE 2016-10-05 01:49:18 +02:00
AMOS bot 21a20a0a65 Automatically generated installer lang files 2016-10-05 00:06:43 +08:00
Dan Poltawski 5885ba383a Merge branch 'MDL-55861_30_STABLE' of https://github.com/dj4452/moodle into MOODLE_30_STABLE 2016-10-04 15:44:06 +01:00
Eloy Lafuente (stronk7) 9416c59e47 Merge branch 'MDL-56069_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-10-04 16:37:50 +02:00
Michael Aherne 9fe421f29e MDL-56220 cache: Call static method correctly 2016-10-04 15:03:23 +01:00
Andrew Nicols 4e2770b175 Merge branch 'MDL-55886-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE 2016-10-04 11:22:40 +08:00
Dan Poltawski 620ca55842 Merge branch 'MDL-56181-30-czechia' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-10-03 16:43:57 +01:00
Dan Poltawski 754c41eb9f Merge branch 'MDL-52317-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE 2016-10-03 16:09:46 +01:00
Dan Poltawski 8edc190aae MDL-54802 quiz: fix bad whitespace 2016-10-03 14:47:21 +01:00
Dan Poltawski df42740f33 Merge branch 'MDL-54802-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-10-03 14:47:17 +01:00
Andrew Nicols 1b5cc6c463 Merge branch 'MDL-55421-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE 2016-10-03 19:49:43 +08:00
Dan Poltawski 3aebea76e0 Merge branch 'wip-MDL-55911-30' of https://github.com/Beedell/moodle into MOODLE_30_STABLE 2016-10-03 10:24:57 +01:00
David Monllao 223378c332 Merge branch 'wip-mdl-56210-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-10-03 13:53:55 +08:00
Daniel Thee Roperto 3320df92f5 MDL-56231 library: Fixed PhpDoc for flexible_table constructor.
The flexible_table::__construct($uniqueid) accepts a string, not an int
as previously noted in the PhpDoc.
2016-10-03 16:05:09 +11:00
Neill Magill 8e2d2046c1 MDL-52317 Atto: Large resized images may display scroll bars
When an image was added via Atto and it was set to resize automatically
if the alignment was set to Top, Middle or Bottom when it was made
smaller then a vertical scroll bar would be displayed.

This was caused by the interaction of the margin settings on the image
and the 100% width set via the img-responsive css class. The width of
an element only includes the content area and not any borders, padding
or margins.

This change stops atto hardcoding the styles for image alignment into
the images style tag, it instead adds a class that defines the alignment
the image should have.

This change has the benefit that themers will now be able to adjust
how atto image alignments work if they wish.

Images added before this patch will continue to have the issue
until they are edited by the plugin, at which time their legacy style
will be removed and the new alignment method will be added.

Thanks to Andrew Nicols who provided a refactor for the Alignment
and style detection code.
2016-09-30 08:51:31 +01:00
Rajesh Taneja 4e9f6420ff MDL-56210 behat: Ensure behat waits for dependancy manager 2016-09-30 10:33:30 +08:00
Dan Poltawski 71d9056aef MDL-55886 block_rss_client: fix oracle compatibility 2016-09-29 16:59:53 +01:00
Deepa Jayaprakash 411fdd46c5 MDL-55861 course: Click drag&drop icon, incorrect activities shown 2016-09-29 16:47:52 +01:00
Dan Poltawski 2a6ac3f844 MDL-55421 travis: check npm/grunt on multiple npm versions
This is a backport of the patch from MDL-55048

Check npm install and grunt execution on the higest and lowest node
versions. Included some minor tweaks along the way:

* Move the grunt execution into scripts part of the configuration (that way
  the grunt output is not collapsed and is easily visible in build output).

* Restructure the install section to be task based (thanks to Eloy for
  the suggestion) and as such, don't run composer install on the grunt
  task (speed up the build slightly).

* Switch around the grunt job to a matrix include so that every
  variation of grunt job doesn't need to be excluded.
  ( https://docs.travis-ci.com/user/customizing-the-build/#Explicity-Including-Jobs )
2016-09-29 16:43:27 +01:00
Dan Poltawski a30b21e86f MDL-55421 js: add some global ignores to js files
This is to prevent linting to be extremely noisy about rollup related
problems.

Should not affect built files.
2016-09-29 16:43:27 +01:00
Dan Poltawski 08f8ff9ffc MDL-55421 eslint: add config/package defintion
Partial backport of MDL-52127 to allow people to use eslint linting
in earlier branches than master.

This is an earlier version of eslint than in master beacuse of
node requirements being higer.
2016-09-29 16:43:27 +01:00
Eloy Lafuente (stronk7) 59fac4cf16 MDL-56127 forms: multiple select dependencies fixed
This is a fix for a regressions introduced by MDL-54778. It
seems that escaped all our tests because there isn't any case
of such a dependency in core, but Daniele Cordella was facing
it within his surveypro module.
2016-09-29 16:52:51 +02:00
Dan Poltawski 43f53ff0f5 weekly release 3.0.6+ 2016-09-29 12:42:58 +01:00
Dan Poltawski f9de835157 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-09-29 12:42:56 +01:00
David Mudrák daa9b4d3c2 MDL-56181 lang: Fix CI and CZ country short names to match ISO 3166 2016-09-29 11:53:11 +02:00
Eloy Lafuente (stronk7) 895b108ff1 Merge branch 'MDL-55804_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE 2016-09-29 01:14:49 +02:00
Eloy Lafuente (stronk7) 0de90550dc Merge branch 'MDL-56019-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE 2016-09-28 20:08:48 +02:00
Dan Poltawski d1b6cf4333 Merge branch 'MDL-56038-m30' of https://github.com/sammarshallou/moodle into MOODLE_30_STABLE 2016-09-28 14:42:49 +01:00
Eloy Lafuente (stronk7) 1c6999087f MDL-46946 user: Document user_not_fully_set_up() changes 2016-09-28 02:23:21 +02:00
Eloy Lafuente (stronk7) 527dc0ce02 Merge branch 'MDL-46946-30-reqcusfield' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-09-28 02:22:03 +02:00
Rajesh Taneja 20a8c2e9c2 MDL-55957 behat: Set some text before selecting in Atto 2016-09-28 01:42:25 +02:00
Eloy Lafuente (stronk7) e1043b0311 Merge branch 'MDL-55951-30' of git://github.com/crazyserver/moodle into MOODLE_30_STABLE 2016-09-28 00:11:43 +02:00
Tim Hunt ff085ba20b MDL-56136 restore: better error handling copying file at start 2016-09-27 18:10:13 +01:00
Tim Hunt 14f75eda28 MDL-56069 quiz: nav buttons don't scroll to the right question
When there is more than one question on a page, say questions 2, 3 & 4.
Then when you click the navigation button for Q4, then it should load
the next page scrolled down so that Q4 is visible. That was not working.
2016-09-27 17:57:51 +01:00
AMOS bot 5b99ccb9e3 Automatically generated installer lang files 2016-09-28 00:04:54 +08:00
Jean-Philippe Gaudreau cd9cf364a1 MDL-56040 behat: Fixing missing "|" in tables 2016-09-27 14:58:03 +01:00
Dan Poltawski 875ee59a5a Merge branch 'MDL-55987-30-grademem' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-09-27 11:23:48 +01:00
Dan Poltawski 96de3cf711 Merge branch 'MDL-55957-30-workshopfiles' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-09-27 10:37:29 +01:00
David Monllao 750a1815b1 MDL-55804 tool_uploadcourse: strftime only to user input
Default value already comes as a timestamp.
2016-09-27 08:12:16 +08:00
David Monllao aca1dc1b63 MDL-55804 forms: Return exported data through _prepareValue 2016-09-27 08:12:16 +08:00
AMOS bot 40b98690ed Automatically generated installer lang files 2016-09-24 00:04:52 +08:00
John Beedell 4296f2b9da MDL-55911 Quiz: Accessibility, Label blanks in DD questions 2016-09-23 13:46:39 +01:00
Eloy Lafuente (stronk7) 1de74443af weekly release 3.0.6+ 2016-09-23 10:01:39 +02:00
Eloy Lafuente (stronk7) 2073c4871b Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-09-23 10:01:35 +02:00
AMOS bot b0a3467e82 Automatically generated installer lang files 2016-09-23 00:04:56 +08:00
Simey Lameze 9283ca1850 MDL-54802 mod_quiz: Add validation to require passing grade greater than 0
This commit adds a form validation to prevent the creation of quizzes
using zero or null grade to pass when using require passing grade.
2016-09-22 08:57:48 +08:00
David Mudrák d0f7cefec6 MDL-46946 user: Make missing required custom fields trigger profile edit
If there is a required custom field that the user can fill by editing
their profile, and that field is missing, the user should be considered
as not fully set up. Instead, we want to redirect them to edit their
profile first.

There are some exceptions when we want to fall back to the previous
behaviour and check just the name and email fields. These exceptional
cases include checking remote user data in incoming MNet request (no
user id, no custom fields supported) and calls to require_login() with
redirecting disabled (typically ajax filepicker requests on profile
editing page itself).

Additional plugins that call the function user_not_fully_set_up()
themselves, should perform the strict check in most/typical cases. So
the strict mode is enabled by default even if it changes the behaviour
slightly. In improbable case of additional plugins relying on the
previous behaviour of the function, they can use the $strict parameter
and keep performing the lax check. However, I am sure the correct fix in
that case will likely be to stop abusing this function.

Note that custom fields are not currently transferred during the MNet
roaming. So having custom fields configured as required on MNet service
provider site (where users can't edit their profiles) is expected to
display an error (as the site is considered as misconfigured).
2016-09-21 18:05:06 +02:00
sam marshall 08e3be8806 MDL-56038 Web services: json_last_error_msg not in PHP 5.4 2016-09-20 14:53:46 +01:00
Andrew Nicols 93c60b87e4 Merge branch 'MDL-55876-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-09-20 09:12:01 +08:00
Simey Lameze cdd3def5b6 MDL-55876 core_course: prevent changes on front page course 2016-09-20 08:52:14 +08:00
Ruslan Kabalin bfe06f7600 MDL-55776 enrol: Optimise enrolled users listing.
Here we optimise SQL queries for enrolled users list. Expensive subquery is
replaced with faster LEFT JOIN and the whole groups filtering component is
aded on demand.
2016-09-19 23:48:41 +02:00
Ruslan Kabalin 3df86df503 MDL-55776 enrol: Add unit tests for enrolment manager. 2016-09-19 23:48:35 +02:00
AMOS bot b733fa7055 Automatically generated installer lang files 2016-09-20 00:04:51 +08:00
Dan Poltawski d989883024 Merge branch 'MDL-55988_30_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_30_STABLE 2016-09-19 12:08:55 +01:00
Dan Poltawski 8c90381a31 Merge branch 'wip-mdl-55117-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-09-19 11:39:44 +01:00
Dan Poltawski fdd56d83e3 Merge branch 'm30_MDL-55820' of git://github.com/danmarsden/moodle into MOODLE_30_STABLE 2016-09-19 11:32:21 +01:00
Dan Poltawski e5c03946e7 Merge branch 'MDL-55944_30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-09-19 11:28:27 +01:00
Eloy Lafuente (stronk7) 350b6ce426 MDL-29332 versions: Force bump becuase patch ones were matching upstream 2016-09-19 12:03:49 +02:00
Eloy Lafuente (stronk7) b11daeca71 Merge branch 'wip-MDL-29332-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-09-19 12:02:46 +02:00
Dani Palou d6fd5d362f MDL-56019 ws: Use itemid null when getting modules intro 2016-09-19 11:48:20 +02:00
David Monllao 8a1a0bbbaf Merge branch 'MDL-42041-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-09-19 15:09:38 +08:00
AMOS bot ecc07981ad Automatically generated installer lang files 2016-09-17 00:04:59 +08:00
Russell Smith 115f9cc02a MDL-55602 session: Add redis handler with locking.
Backport of MDL-54606
2016-09-16 08:15:30 -07:00
Mark Johnson a4a2d1edd0 MDL-55988 Forms: Stop autocomplete triggering warning on unload
Prevents autocomplete fields marking a form "dirty" when initialised,
and allows them to honour the "ignoredirty" class.
2016-09-16 13:09:05 +01:00
David Mudrák 6ff87b25d4 MDL-55987 gradebook: Claim extra memory when updating final grades
As we experienced in a bigger moodle.org course (7500 users, 70 grade
items), the standard memory limit 256M may not be enough here. We were
not able to find any obvious memory leak in the processing. Requiring
extra memory helped in this particular case and it seems reasonable to
have it in the core.
2016-09-16 12:49:51 +02:00
AMOS bot 20c207639a Automatically generated installer lang files 2016-09-16 00:05:26 +08:00
Dan Poltawski cb3b8c222e weekly release 3.0.6+ 2016-09-15 11:15:01 +01:00
David Monllao be08c8a7de Merge branch 'MDL-55945-30' of https://github.com/snake/moodle into MOODLE_30_STABLE 2016-09-15 12:39:01 +08:00
Jake Dallimore fe096488fe MDL-55945 login: fix https support for forgot_password.php 2016-09-15 09:22:41 +08:00
David Mudrák 01ffc90d90 MDL-55957 workshop: Add behat tests for embedded images
This tests basic functionality of the images embedded into the
instructions and conclusion fields.
2016-09-14 14:38:04 +02:00
David Mudrák 3c215fa3d2 MDL-55957 workshop: Fix the embedded files serving
There was a bug with serving the files from the areas instructauthors,
instructreviewers and conclusion. These three areas should not use the
itemid in the plugininfo URLs. But they did use 0 as the itemid which
broke the file previews when browsing via server files repository.

The first part of the patch fixes all relevant calls to
file_rewrite_pluginfile_urls() so that null is now properly used instead
of zero.

The second part of the fix is that we no longer delete the first $args
element in the workshop_pluginfile() function - the itemid is not
supposed to appear there now.

The last part of the patch is that instead of repeating the same code
block copy&pasted for each file area in workshop_pluginfile(), we now
have a single block covering them all.
2016-09-14 12:43:24 +02:00
Rajesh Taneja d7c33a1392 MDL-55117 behat: Re-initialise to ensure modified config is not used
As behat cli process is 1 run for features
Any modification in  will be reflected
in later runs on cli. In this case
- disabling enablebadges in block_badges.feature
- reflected while running cron in award_badges.feature
2016-09-14 10:47:15 +08:00
Russell Smith 85efc6975a MDL-55944 testing: Reduce sleep usage.
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
2016-09-14 10:26:14 +10:00
Marina Glancy 789b0b62c3 MDL-55864 general: fix PHP7.1 strict warnings 2016-09-13 15:24:17 +01:00
Pau Ferrer Ocaña 078d007b87 MDL-55951 output: Add errorcode to fatal_error when available 2016-09-13 15:30:25 +02:00
Adrian Greeve 43e6d24c87 MDL-55505 mod_assign: Fix to feedback behat test. 2016-09-13 11:16:07 +08:00
Marina Glancy bc48debf36 MDL-29332 question: calculated variables may differ in case only 2016-09-13 10:15:26 +08:00
Eloy Lafuente (stronk7) 76b676b929 Merge branch 'wip-MDL-55505-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-09-12 19:26:36 +02:00
Eloy Lafuente (stronk7) 03eab92866 Merge branch 'wip-MDL-55654-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-09-12 19:16:08 +02:00
Eloy Lafuente (stronk7) 71bea77b6a Merge branch 'MDL-55632-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-09-12 19:03:37 +02:00
Eloy Lafuente (stronk7) d4b14d6298 Merge branch 'MDL-55874-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE 2016-09-12 18:32:45 +02:00
Dan Poltawski d357ee7039 Merge branch 'wip-mdl-55353-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-09-12 11:49:38 +01:00
Dan Poltawski be27606bf1 Merge branch 'wip-MDL-55862-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-09-12 11:11:28 +01:00
Dan Poltawski 5a9d8d48ca Merge branch 'wip-mdl-55610-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-09-12 10:18:20 +01:00
David Monllao 16c89550d8 Merge branch 'MDL-55626-M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE 2016-09-12 12:39:15 +08:00
David Monllao 1e95a37cf3 Merge branch 'MDL-53893-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-09-12 10:29:43 +08:00
Eloy Lafuente (stronk7) b022c2cd1c Moodle release 3.0.6 2016-09-10 22:50:18 +02:00
lazydaisy be50133b45 MDL-55626 theme_clean: Fixed clean theme missing desktop-first-column 2016-09-10 01:24:12 +01:00
Marina Glancy 7416cc5d48 MDL-55654 user: apply format_string to field names 2016-09-09 14:31:51 +08:00
Rajesh Taneja 65c0e2b9b4 MDL-55353 behat: Ensure teacher edit activity at different time
Recent activity is showing activities which were
updated since user last logged in and first modification
done on the activity. So ensure update happens at different
time than activity created.
2016-09-09 10:17:18 +08:00
Simey Lameze 95c919d651 MDL-53893 core_badges: Behat for all selected roles award badges 2016-09-09 08:44:22 +08:00
Simey Lameze 8dcf12afdc MDL-53893 core_badges: Add strictness to manual badge criteria 2016-09-09 08:44:22 +08:00
Adrian Greeve 598e62100c MDL-55505 mod_assign: Editing previous attempt works correctly.
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
2016-09-08 20:33:22 +08:00
Adrian Greeve e9bf5a3998 MDL-55862 mod_data: Use proper name function for display.
The old method for displaying the name of a field was being
used. This meant that it was not possible to show a plugin's
name in view.php

Thanks to David Herney Bernal for providing a solution.
2016-09-08 20:30:00 +08:00
Dan Poltawski be4e216e6b MDL-55874 report_particiption: fix invalid html
When messaging disabled.
2016-09-08 08:05:06 +01:00
David Monllao 04b0feca62 weekly release 3.0.5+ 2016-09-08 13:56:37 +08:00
Adrian Greeve 8b61a6a338 MDL-41174 course: Update calendar events.
Updates calendar events when the activity name is changed.
2016-09-07 14:17:05 +08:00
Jake Dallimore f9c8cef1a4 MDL-50803 login: Remove token from URL in forgot password process
Store the token value in the session and redirect to self, thus
removing the token from the URL and eliminating the problem where
the token is exposed via the http referer header.
2016-09-06 22:22:25 +08:00
Juan Leyva d80dbeb289 MDL-49026 webservice: Remove tokens on password change 2016-09-06 22:22:25 +08:00
Eloy Lafuente (stronk7) 5b33ea8f59 Merge branch 'MDL-55618-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE 2016-09-06 16:20:51 +02:00
Eloy Lafuente (stronk7) f38037357a Merge branch 'wip-MDL-55844-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-09-06 16:08:31 +02:00
Dan Poltawski 03200f984e Merge branch 'MDL-42125_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-09-06 11:48:52 +01:00
Dan Poltawski e4a959503b Merge branch 'wip-mdl-55749-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-09-06 08:46:09 +01:00
Andrew Nicols aaf50eed5d MDL-42041 mod_book: Add Turn Editing On to page body 2016-09-06 15:39:44 +08:00
Rajesh Taneja b6c2b6e0f6 MDL-55749 badges: define global before using it 2016-09-06 10:29:03 +08:00
David Monllao 2e77fffa31 Merge branch 'MDL-55617-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE 2016-09-06 10:18:25 +08:00
David Monllao ef8d67664b Merge branch 'MDL-55587-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-09-06 10:07:21 +08:00
Rajesh Taneja 9074566c1d MDL-55610 behat: Clear static file cache
php file cache might be out-of-sync
to ensure full directory is deleted
clear php file cache
2016-09-06 09:44:20 +08:00
Eloy Lafuente (stronk7) 9c238c8e25 Merge branch 'MDL-55663-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE 2016-09-05 18:07:27 +02:00
Eloy Lafuente (stronk7) d5e3b4879e Merge branch 'MDL-55724-m30' of https://github.com/sammarshallou/moodle into MOODLE_30_STABLE 2016-09-05 17:33:54 +02:00
Dan Poltawski 7b6f134c96 Merge branch 'MDL-55627_30' of https://github.com/bostelm/moodle into MOODLE_30_STABLE 2016-09-05 14:09:15 +01:00
Dan Poltawski b350178a7c Merge branch 'MDL-55742-30' of https://github.com/xow/moodle into MOODLE_30_STABLE 2016-09-05 10:50:47 +01:00
Henning Bostelmann dbf9bf0dab MDL-55627 filter_mathjaxloader: use correct string concatenation op 2016-09-05 11:43:16 +02:00
Dan Poltawski cab725229c Merge branch 'MDL-55771_m30' of git://github.com/markn86/moodle into MOODLE_30_STABLE 2016-09-05 10:18:52 +01:00
Dan Poltawski 2087df46f6 Merge branch 'MDL-55815_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-09-05 08:57:38 +01:00
Dan Poltawski bc82c260b8 Merge branch 'MDL-54113-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-09-05 07:53:07 +01:00
David Monllao 8902327ac9 Merge branch 'wip-MDL-41174-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-09-05 13:46:12 +08:00
Adrian Greeve 39aa2988b3 MDL-41174 course: Module name change updates calendar. 2016-09-05 08:59:02 +08:00
Marina Glancy f09f5a3c88 MDL-55844 profile: display formatted course name 2016-09-02 18:05:12 +08:00
John Okely ac8e288f11 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:46:40 +08:00
Tim Hunt 3ab94015bb MDL-42125 quiz stats: clearer message when manual grading required 2016-09-01 12:36:00 +01:00
Neill Magill 21fcfae6b7 MDL-55617 backup: Possible fatal errors in backup and restore
The unserialize() function will not always return an object
especially when as can happen the controller field of a
record in the backup_controllers table is empty.

This change ensures that in this case the script will
not cause a fatal error, but instead throw an error.
2016-09-01 08:50:16 +01:00
Neill Magill cb9594a285 MDL-55618 backup: Header should not be output twice
Before this patch if the pre-check failed during
the final stage of an import a request for the
page header to be output was made for a second
time, this caused a coding_error to occur.

This change removes the second request to
output the page header, which will allow the user
to see the reasons the pre-check failed.
2016-09-01 08:48:55 +01:00
John Okely 99f6caea55 MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc
Thanks to Bishop Bettini for the original patch.
2016-09-01 15:00:05 +08:00
David Monllao 4846a96518 weekly release 3.0.5+ 2016-09-01 11:14:08 +08:00
David Monllao 258d8124ed Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-09-01 11:14:06 +08:00
Dan Marsden e46c306d8e MDL-55820 scorm: use correct displayattempt default options 2016-09-01 13:30:33 +12:00
Tim Hunt 9ad7051878 MDL-55815 quiz review: after close should beat immediately after
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
2016-08-31 13:00:25 +01:00
Tim Hunt 75ca17683b MDL-55815 quiz: convert attempt state tests to a data provider 2016-08-31 13:00:24 +01:00
Eloy Lafuente (stronk7) 4a59ad1168 Merge branch 'MDL-55237_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE 2016-08-30 12:55:03 +02:00
sam marshall 599e1a877b MDL-55724 Glossary: Prevent infinite loop in trusttext_strip 2016-08-30 10:32:00 +01:00
Mark Nelson e13382cd6b MDL-55771 core: added title attribute when using JS to render {{pix}} 2016-08-30 14:58:57 +08:00
Marina Glancy c6adb42063 MDL-55581 htmlpurifier: test for attributes in video tag 2016-08-30 13:49:57 +08:00
Frederic Massart df248aab58 MDL-55663 filter: Filters could be incorrectly reported as inactive 2016-08-30 11:23:18 +08:00
David Mudrák 302d9fea73 MDL-55660 tablelib: Fetch only a single row when auto defining columns
In a very rare cases where the columns are not declared explicitly, we
want to fetch single row only without a warning raised. This seems like
a valid use case for IGNORE_MULTIPLE flag.
2016-08-29 19:14:19 +02:00
AMOS bot 6721af2ec4 Automatically generated installer lang files 2016-08-30 00:05:12 +08:00
Eloy Lafuente (stronk7) 5096a6d39d Merge branch 'MDL-55667-30-participantslink' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-08-29 16:54:04 +02:00
Eloy Lafuente (stronk7) 5997c8775d Merge branch 'MDL-55741_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-08-29 14:08:54 +02:00
Cameron Ball a7085963b5 MDL-55587 core_media: Properly escape ampersand 2016-08-29 19:16:37 +08:00
David Mudrák 9dc0baedfa MDL-55667 navigation: Do not display site participants link to students
The problem here was that user/index.php checks the system level
capability moodle/site:viewparticipants when the user is on the front
page, and the moodle/course:viewparticipants on non-front pages.

But the navigation displayed the link by mistake even in situations,
when the user has the capability moodle/course:viewparticipants on the
front page (typically when the default role for the front page is set to
student).

Added behat tests for reproducing the bug and also for checking the
basic functionality of the feature.
2016-08-29 12:11:53 +02:00
David Monllao 12ed0259b6 Merge branch 'wip-MDL-55581-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-29 16:54:29 +08:00
David Monllao 092fecd7be Merge branch 'MDL-55661-30-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-08-29 14:40:50 +08:00
David Monllao 22a42d5093 Merge branch 'MDL-55312_load_timeout_for_amd_modules_30' of https://github.com/gthomas2/moodle into MOODLE_30_STABLE 2016-08-29 14:31:59 +08:00
Marina Glancy 4496863cfd MDL-55581 htmlpurifier: allow track tag in videos and audios 2016-08-29 13:26:24 +08:00
David Monllao f2a7331dca Merge branch 'wip-MDL-55708-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-29 11:19:15 +08:00
David Monllao 443dcc00c3 Merge branch 'MDL-55477_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-08-29 11:14:36 +08:00
David Monllao abac5252aa MDL-55237 mod_forum: Adding missing require as in 31 and master 2016-08-29 10:11:06 +08:00
Tim Hunt affe326f23 MDL-55741 phpunit: does not reset get_log_manager cache 2016-08-26 17:15:40 +01:00
AMOS bot f451db08d4 Automatically generated installer lang files 2016-08-27 00:05:01 +08:00
Helen Foster ab71d16bd8 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:41:55 +02:00
Dan Poltawski b5f3ed32a6 weekly release 3.0.5+ 2016-08-25 12:09:41 +01:00
Dan Poltawski b9435d3688 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-08-25 12:09:40 +01:00
Marina Glancy 3ea2065563 MDL-55708 mod_assign: display formatted acitvity names 2016-08-25 09:53:59 +08:00
AMOS bot bca6ca7a2a Automatically generated installer lang files 2016-08-25 00:05:43 +08:00
Andrew Nicols ba175bc7ac MDL-54113 assign: Open files in new window
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
2016-08-24 11:34:27 +08:00
David Monllao 4e4040df85 Merge branch 'MDL-55604-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-08-24 09:36:46 +08:00
Russell Smith d391b3472a MDL-55604 cache: Fix identifier and cacheable_object
When a cachable object is store in the static cache from
the backing store, it was incorrect serialised rather than
using the wake function.  This has been resolved and tests added.

During the investigation into cacheable_object, it was discovered
that set_identifiers never removes identifiers when you call it,
so set_identifiers(array('a')) and set_identifiers(array('b')) really
resulted in array('a','b') as the identifiers rather than 'b'.

The fix for this issue depends on the set_identifiers fix and
they have been coupled together as a result.
2016-08-24 08:28:50 +10:00
gthomas2 57a5be5490 MDL-55312 requirejs: Fix timeouts with infinite waitSeconds 2016-08-23 17:42:01 +01:00
Dan Poltawski f3c7517c85 Merge branch 'MDL-55628-m30' of https://github.com/sammarshallou/moodle into MOODLE_30_STABLE 2016-08-23 15:48:13 +01:00
Dan Poltawski 09c37aa4eb Merge branch 'wip-mdl-46514-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-08-23 08:59:40 +01:00
David Monllao 16ede7192d Merge branch 'MDL-46654-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-08-23 15:31:23 +08:00
Andrew Nicols 49b3391b98 MDL-46654 mod_forum: Hide digestoptions when no subscription
Daily digest options should not be generated if the user cannot subscribe
to anything in the first place.
2016-08-23 15:10:25 +08:00
David Monllao 893b75e690 Merge branch 'MDL-54838-30' of https://github.com/nashtechdev01/moodle into MOODLE_30_STABLE 2016-08-23 12:44:49 +08:00
sam marshall d34fa71df4 MDL-55628 Completion: Use simpledata for completion cache
The completion cache is currently not marked as simpledata. On the
course page it is frequently retrieved hundreds of times which results
in many calls to the slow unserialize function. By making a slight
change to the data format (using arrays instead of objects) we can
mark it as simpledata, which will avoid using unserialize.
2016-08-22 17:16:50 +01:00
Dan Poltawski bacf77c9d7 Merge branch 'MDL-55273-cookie-secure-default-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE 2016-08-22 15:25:40 +01:00
Jake Dallimore 88e7c13d9a MDL-55565 core_backup: Fix warning when restoring question categories
Fixed a call to get_records_sql, which was being used incorrectly in
restore_find_best_target_context to determine a unique contextid.
2016-08-22 14:23:21 +01:00
Dan Poltawski a2b3f5864b Merge branch 'MDL-55605-lesson-restore-bug-MOODLE_30_STABLE' of https://github.com/kenneth-hendricks/moodle into MOODLE_30_STABLE 2016-08-22 14:13:28 +01:00
Dan Poltawski 2dc70084d3 Merge branch 'MDL-55551_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-08-22 12:53:34 +01:00
Dan Poltawski 68ec7cb526 Merge branch 'MDL-55557_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-08-22 12:45:55 +01:00
Dan Poltawski a7a02f8cc0 Merge branch 'wip-MDL-22183-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-08-22 09:12:54 +01:00
Brendan Heywood 1a93f1de4a MDL-55273 admin: Change $CFG->cookiesecure default to on 2016-08-22 09:24:12 +10:00
Tim Hunt 85f7df7e06 MDL-55477 quiz reports: all user fields should have repeats suppressed 2016-08-19 18:05:15 +01:00
Rajesh Taneja d235685214 MDL-46514 behat: section should be set before switch-case 2016-08-19 14:13:03 +08:00
Andrew Nicols b509663e15 MDL-55632 mod_forum: Tidy up forum post messages 2016-08-19 09:58:50 +08:00
Kenneth Hendricks 251752740b MDL-55605 mod_lesson: Fix activitylinks restore bug 2016-08-18 16:39:38 +10:00
Adrian Greeve 66fc37ed7f MDL-22183 lib: More unit tests for next day start. 2016-08-18 10:25:18 +08:00
Adrian Greeve 5f46e36461 MDL-22183 lib: Cleanup of get_next functions. 2016-08-18 10:25:18 +08:00
Adrian Greeve 496be783b3 MDL-22183 lib: Time settings removed for stats cron.
Old settings that should be ignored have been removed from the
statistics cron code.
2016-08-18 10:25:18 +08:00
Dan Poltawski 490e8f97e6 weekly release 3.0.5+ 2016-08-17 14:47:14 +01:00
Dan Poltawski bc0fc18cec Merge branch 'MDL-36713_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-08-16 12:05:23 +01:00
Andrew Nicols dec2a585a3 Merge branch 'MDL-55272-30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE 2016-08-16 15:11:39 +08:00
Russell Smith ffd94de398 MDL-55272 lib: Allow random_bytes() to return large values.
PHP has a recursion limit and random_bytes on PHP5.6 without openssl
will error if sent a large value.  Using a loop has lower overhead than
recursion as well.
2016-08-16 12:16:45 +10:00
Stephen Bourget 20fb475465 MDL-36713 Blog: Display accurate error when a guest views a user blog 2016-08-15 21:50:31 -04:00
Andrew Nicols cf9a76e739 Merge branch 'wip-MDL-50586-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-16 08:52:56 +08:00
Dan Poltawski 92ed7da4d1 Merge branch 'wip-MDL-55494-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-15 13:14:42 +01:00
Dan Poltawski 014237d27d MDL-52105 enrol_self: fix upgrade savepoint 2016-08-15 12:11:50 +01:00
Dan Poltawski 09dec86ebd Merge branch 'wip-MDL-55366-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-08-15 11:43:41 +01:00
Dan Poltawski 8f300a967c Merge branch 'wip-MDL-55397-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-15 11:35:39 +01:00
Dan Poltawski 37cee5e44a Merge branch 'MDL-52105-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-08-15 11:14:06 +01:00
Simey Lameze 67bdccc036 MDL-52105 enrol_self: Behat test for key holder feature 2016-08-15 13:00:28 +08:00
Simey Lameze ed21b54c5a MDL-52105 enrol_self: Fix wrong holdkey cap restriction for manager
This commit add an upgrade step to remove wrong CAP_PROHIBIT on enrol/self:holdkey for manager role.
Also remove the restriction from the self enrolment access file.
2016-08-15 13:00:28 +08:00
Adrian Greeve 038cfaffcc MDL-55366 mod_lesson: Fix warning with TF page.
Having an image in the answer text would create a warning.
2016-08-15 10:22:21 +08:00
Stephen Bourget 31348f709e MDL-55557 mod_wiki: Add missing MOODLE_INTERNAL checks 2016-08-13 21:43:23 -04:00
Stephen Bourget 989dd5a826 MDL-55551 Blog: Add missing MOODLE_INTERNAL check. 2016-08-12 20:22:57 -04:00
Marina Glancy f7503bd6c2 MDL-55494 report_eventlist: ignore only logstore_legacy 2016-08-12 13:56:14 +08:00
Marina Glancy 23fb083903 MDL-55494 tool_monitor: ignore only tool_monitor and logstore_legacy
previously any plugin type ending with _monitor or _legacy would be ignored
2016-08-12 13:56:14 +08:00
Marina Glancy de9cd39715 MDL-50586 gradingform_rubric: warn about missing 0-points levels 2016-08-12 13:26:32 +08:00
Marina Glancy a52c83d83e MDL-55397 block_site_main_menu: eliminate CSS conflict
CSS for '.path-admin .buttons' defines padding, border and background that affected how main menu looks on admin pages
2016-08-11 15:43:41 +08:00
Andrew Nicols d418f42040 weekly release 3.0.5+ 2016-08-11 13:17:12 +08:00
Andrew Nicols 02d570966a Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-08-11 13:17:08 +08:00
AMOS bot 3ea6de7502 Automatically generated installer lang files 2016-08-10 00:05:07 +08:00
Dan Poltawski c6cb45fce7 Merge branch 'wip-MDL-55425-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-09 10:58:42 +01:00
Dan Poltawski 7502cdf6c6 MDL-51078 report_log: use simpler/faster str_split over preg_split 2016-08-09 09:09:15 +01:00
Stephen Bourget d1a50dce98 MDL-51078 report_log: Allow filtering by all changes 2016-08-09 09:09:09 +01:00
Andrew Nicols 95cc9d3b53 Merge branch 'wip-mdl-55329-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-08-09 14:28:19 +08:00
Andrew Nicols c8c910b1bd MDL-55274 mod_chat: Add unit tests for special commands 2016-08-09 10:49:53 +08:00
Andrew Nicols 6c0deebbd9 Merge branch 'MDL-55274-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE 2016-08-09 10:49:47 +08:00
Dan Poltawski 771f142254 Merge branch 'MDL-55398_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-08-08 10:40:50 +01:00
Mark Nielsen 339ca4ca04 MDL-55453 core_lib: Fix usage of js_send_uncached 2016-08-08 09:54:22 +01:00
Russell Smith 42a4a52a4c MDL-55292 performance: Allow Tideways profiler extension.
PHP7 doesn't have any default XHProf support and all other
investigated forks don't have stable PHP7.  Tideways is under
active development and is easy to install.  The data format
is compatible with XHProf so it is a drop-in replacement in that way.
2016-08-08 15:26:42 +08:00
Nick Phillips 06c9734dc8 MDL-55274 mod_chat: regain beep and / command in mod_chat.
format_text cannot be called on the whole input text, but must be
called on user-supplied text that will be output into chats. This
means it cannot simply be called in one place, but must instead be
called on the relevant parts of text once commands have been matched.
2016-08-08 12:29:32 +08:00
Andrew Nicols 2cfeebee65 Merge branch 'MDL-55454_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE 2016-08-08 10:04:18 +08:00
AMOS bot 32a9efd6dc Automatically generated installer lang files 2016-08-06 00:05:20 +08:00
Marina Glancy 6ed74faf27 MDL-55425 user: allow to update another user editor pref 2016-08-05 09:39:36 +08:00
Andrew Nicols e7c8da0fb8 weekly release 3.0.5+ 2016-08-04 09:58:53 +08:00
Andrew Nicols 4c9af61327 Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-08-04 09:58:50 +08:00
Rajesh Taneja 0944b1641a MDL-54656 behat: Skip test if db family is not mysql or postgres 2016-08-04 08:47:42 +08:00
Tim Hunt f19f239c98 MDL-55454 quiz: loses shufflequestion setting restoring old backups 2016-08-03 18:43:28 +01:00
Eloy Lafuente (stronk7) b7f6ea3578 Merge branch 'MDL-54656_m30v3' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-08-03 00:51:52 +02:00
Eloy Lafuente (stronk7) 95086f294b Merge branch 'MDL-55166-30-blocksettings' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-08-03 00:34:11 +02:00
Dan Poltawski a896f02f1f MDL-54847 tests: fix unused var 2016-08-02 20:16:45 +01:00
Cameron Ball 4f9a64b6ff MDL-54847 weblib: Test media attributes individually 2016-08-02 20:16:41 +01:00
Dan Poltawski 10ba40f1c3 Merge branch 'wip-MDL-33741-m30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE 2016-08-02 12:20:33 +01:00
Dan Poltawski 6e882379f4 Merge branch 'MDL-54847-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-08-02 10:59:55 +01:00
Cameron Ball d2d65178fa MDL-54847 weblib: Support basic HTML media tags 2016-08-02 15:55:39 +08:00
Andrew Nicols 500e6d4519 Merge branch 'MDL-55376-30-fix' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-08-02 12:06:29 +08:00
Cameron Ball 4847d73829 MDL-55376 mod_assign: Update behat test 2016-08-02 10:43:37 +08:00
Stephen Bourget 8ecd647160 MDL-55398 mod_feedback: prevent direct script access to lib files. 2016-08-01 20:56:14 -04:00
Dan Poltawski 79598473d2 Merge branch 'MDL-55360-30-workshopgradepass' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE 2016-08-01 18:57:22 +01:00
AMOS bot 8312bbfd7c Automatically generated installer lang files 2016-08-02 00:04:37 +08:00
Dan Poltawski 32949a75a7 MDL-55376 assign: trailing whitespace 2016-08-01 16:08:02 +01:00
Dan Poltawski 2e9332b85d Merge branch 'MDL-55376-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-08-01 16:06:58 +01:00
Dan Poltawski b907a57262 Merge branch 'MDL-53691-M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE 2016-08-01 11:47:44 +01:00
Andrew Nicols cc3126b724 Merge branch 'MDL-53152-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-08-01 15:08:14 +08:00
Jun Pataleta b5eaf7a60a MDL-53152 theme: Add parentheses to variable calculations 2016-08-01 13:43:30 +08:00
Marina Glancy 4fdeed4bec MDL-33741 file_info: show courses in hidden categories
This also has a couple of bugfixes:
- file_info_context_system::get_children() was looking for courses with parent=0, it is impossible, block removed;
- file_info_context_coursecat::get_area_coursecat_description() was checking the wrong capability to view files in description
2016-08-01 09:15:22 +08:00
Marina Glancy d9bea44f18 MDL-33741 file_info: check capability when serving file in coursecat description 2016-08-01 09:15:15 +08:00
Cameron Ball b61059dbd2 MDL-55376 mod_assign: Fix bug stopping admin from editing submissions 2016-07-29 19:09:07 +08:00
AMOS bot 306c38dfcd Automatically generated installer lang files 2016-07-29 00:06:01 +08:00
David Mudrák 4d5707a128 MDL-55360 workshop: Add tests for setting grades to pass via mod form
These scenarios should cover common cases of defining the grades to pass
pass via the workshop settings form. Note that behaviour of the fields
in terms of locale-specific decimals input (MDL-51806) is not covered
with these tests as I want to avoid installation of additional language
pack. Instead, I assume that functionality of unformat_float() is tested
separately in the core.
2016-07-28 09:54:46 +02:00
David Mudrák 2510fae394 MDL-55360 workshop: Emptying grades to pass should set them to zero
When editing existing workshop with a grade to pass defined, when the
field is emptied, it should be interpreted as setting it to zero. This
was not happening because unformat_float replaces the field with null,
therefore effectively unsetting it.

By casting to float, we interpret all empty values (including null) as
zeros. This behaviour is consistent with how gradebook setup UI works.
2016-07-28 09:54:46 +02:00
David Mudrák cd830f4e2c MDL-55360 workshop: Allow creating workshops with empty grades to pass
As a regression of MDL-55360, it was not possible to create new
workshops if the field "Submission grade to pass" or "Assessment grade
to pass" was left empty. The validation failed with "You must enter a
number here".

The fields submissiongradepass and gradinggradepass are always present
as we explicitly define them in the mod form. So the isset() condition
in the validation was useless and it did not allow to submit the form
with these fields empty.

Additionally, the unformat_float() returns null only if it receives
empty value on the input. Which can't happen in our case so I am
removing this condition to improve the readability of the code.
2016-07-28 09:54:46 +02:00
David Monllao bcf700b088 weekly release 3.0.5+ 2016-07-28 12:07:23 +08:00
David Mudrák 5914ef444c MDL-55166 admin: Fix display of misleading debug warning on manage block
Blocks can declare has_config() as true without actually using the
default node in the admin tree. Typical use case is when the block
injects its settings to other parts of the admin tree and it assigns
null to its $setting node in its settings.php file.

As Janek L.B. correctly spotted, this led to false debugging message
on admin/blocks.php as the code interpreted it as missing settings.php
file.

The patch adds explicit file existence test for this rare case.
2016-07-27 23:16:34 +02:00
Rajesh Taneja 7c74b0aeb8 MDL-55329 behat: PyStrings should end with : (colon) 2016-07-27 07:02:34 +08:00
Rajesh Taneja d574272a0c MDL-55337 behat: After posting click to redirect page 2016-07-27 06:39:40 +08:00
lazydaisy d9d3ec4e55 MDL-53691 theme_bootstrapbase: Backport of MDL-53147 2016-07-26 21:43:44 +01:00
Eloy Lafuente (stronk7) 8d5deef79e Merge branch 'wip-MDL-51735-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-07-26 20:17:50 +02:00
Eloy Lafuente (stronk7) fbba7dfee6 Merge branch 'MDL-54657_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-07-26 19:57:16 +02:00
Eloy Lafuente (stronk7) 89a02c4370 Merge branch 'wip-mdl-55337-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-07-26 13:27:20 +02:00
Rajesh Taneja 22f3ebaad9 MDL-55337 behat: Added 1 sec delay between post
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
2016-07-26 19:01:59 +08:00
David Monllao 568fea46d2 Merge branch 'wip-MDL-55183-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-07-26 09:57:07 +08:00
David Monllao 44d7062228 Merge branch 'MDL-55283-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-07-26 05:05:07 +08:00
David Monllao 329e98a621 Merge branch 'MDL-51242-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-07-26 02:41:27 +08:00
Stephen Bourget e1fe3532a0 MDL-55252 mod_chat: prevent direct script access to lib files. 2016-07-25 09:42:39 +01:00
Stephen Bourget 149ae1248e MDL-55253 mod_choice: prevent direct script access to lib files. 2016-07-25 09:40:48 +01:00
Stephen Bourget 485f8744a4 MDL-55255 mod_data: prevent direct script access to lib files. 2016-07-25 09:40:20 +01:00
An Pham Van 74a0d2afb6 MDL-54838 workshop: Differentiate labels for each comment field.
In a Workshop activity, comment fields on Assessment forms do not properly link to the corresponding Aspect.
So screen reader users may find it difficult to complete the Assessment forms.
There should be a hidden label text for each comment field.
2016-07-25 14:38:36 +07:00
Adrian Greeve c43e0956d5 MDL-51735 mod_lesson: A lesson with no content shows a message.
Before it would show an error.
2016-07-25 10:55:50 +08:00
Adrian Greeve c310304149 MDL-55183 editor_atto: Fix requires error.
When using a different theme and removing an editor
plugin such as the equation plugin, atto will display
an error about a missing dependency.

A thank you to Anthony Forth for providing this patch.
2016-07-25 09:17:53 +08:00
Eloy Lafuente (stronk7) a244bd7eaa weekly release 3.0.5+ 2016-07-21 11:45:03 +02:00
Eloy Lafuente (stronk7) ec75234e9c Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-07-21 11:44:59 +02:00
Andrew Nicols 4fdf0b226c MDL-55283 javascript: Check dir is readable before traversing them 2016-07-20 12:17:08 +08:00
AMOS bot f6409a7719 Automatically generated installer lang files 2016-07-20 00:05:39 +08:00
Eloy Lafuente (stronk7) 44ce1facbc Merge branch 'MDL-55220-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE 2016-07-19 13:22:43 +02:00
Dan Poltawski f11742850f Merge branch 'MDL-55206-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-07-19 10:52:47 +01:00
Dan Poltawski baaf2e67e1 Merge branch 'MDL-54915-30' of http://github.com/damyon/moodle into MOODLE_30_STABLE 2016-07-19 09:39:09 +01:00
Dan Poltawski 19421799cb Revert "Merge branch 'MDL-54915-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE"
This reverts commit 4b6e0cbd57, reversing
changes made to 8d6dde0805.
2016-07-19 09:37:36 +01:00
David Monllao 1e56841201 Merge branch 'MDL-55157_m30v6' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-07-19 08:42:24 +02:00
Damyon Wiese 28436ac123 MDL-54915 templates: Fix async rendering of js blocks
Mustache JS helper can overwrite JS blocks when using nested templates.

Each call to render should have it's own scope.

Conflicts:
	lib/amd/build/templates.min.js
	lib/amd/src/templates.js
2016-07-19 13:19:48 +08:00
Frederic Massart d2b890c689 MDL-4915 templates: Improve JS string handling in templates
Backported from MDL-53667 to make cherry-picking easier across branches.

The native String.replace method in extremely slow when we are
dealing with a large string and large quantity of strings to replace.
This new solution walks through the string looking for placeholders
to replace.
2016-07-19 13:15:38 +08:00
Stephen Bourget ad097b6fbd MDL-55157 mod_feedback: Course reset should update dates 2016-07-18 22:11:39 -04:00
Eloy Lafuente (stronk7) 3724d55c21 MDL-52544 oracle: small tweaks
This commit just:

- Moves the null => '' to better place, restricting it to PHP >= 7.0
  (bug https://bugs.php.net/bug.php?id=72524)
- Adds a couple of notes here and there.
- Changes some small details to keep the file using the same coding.
2016-07-19 04:04:57 +02:00
Eloy Lafuente (stronk7) 353c12c32f Merge branch 'MDL-52544-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE 2016-07-19 04:04:51 +02:00
Eloy Lafuente (stronk7) da0d992d20 Merge branch 'MDL-51410_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-07-19 02:31:40 +02:00
David Monllao 32d225deab Merge branch 'MDL-55161-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE 2016-07-18 20:02:32 +02:00
David Monllao a4de0bbd59 Merge branch 'MDL-55163-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE 2016-07-18 19:45:23 +02:00
Dan Poltawski 87c1a2e7e8 Merge branch 'wip-mdl-55174-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE 2016-07-18 14:49:54 +01:00
Dan Poltawski 5a00afe7ab Merge branch 'MDL-55012-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE 2016-07-18 13:55:23 +01:00
Dan Poltawski 5ef2a25523 Merge branch 'MDL-55240-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-07-18 10:51:10 +01:00
Dan Poltawski 4b6e0cbd57 Merge branch 'MDL-54915-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE 2016-07-18 09:17:55 +01:00
AMOS bot 6eb850896a Automatically generated installer lang files 2016-07-16 00:05:50 +08:00
Jun Pataleta 2148abcd34 MDL-55206 admin: Some code cleanup
* Removed unnecessary TODOs.
* Changed message prompt case to sentence case.
2016-07-15 14:54:44 +08:00
Jun Pataleta 70883b76fd MDL-55206 admin: Remove div tags in password policy error message 2016-07-15 14:54:44 +08:00
Rajesh Taneja b5b18eb572 MDL-55174 core_testing: Use proper directory separator
While searching for existing files if directory
separator is not correct then original files
and directories will be deleted. So use DIRECTORY_SEPARATOR.
2016-07-15 13:54:22 +08:00
Damyon Wiese c345d23084 MDL-55012 Atto: no style attrs on paste
Specifically on paste - we don't need all the random style attributes
from content on the clipboard. When you copy from a webpage - the browser
inlines all the styles from the page so that the pasted content will look
like the place it was copied from. But this is never what you want - you
want the content on paste, but with no special styling.
2016-07-15 13:41:45 +08:00
Jun Pataleta 8e6d1ac1d6 MDL-55240 editpdf: Revert changes in MDL-54772
* Revert rendering of annotations and comments back to the
  drawing region.
* Bind events to stamp annotation when editing only.
2016-07-15 10:39:38 +08:00
David Monllao 8d6dde0805 weekly release 3.0.5+ 2016-07-14 11:28:46 +02:00
David Monllao 0dc21f5a0e Merge branch 'install_30_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_30_STABLE 2016-07-14 11:28:44 +02:00
Juan Leyva c7ae332304 MDL-55220 forum: Add string filtering in WS
The following external functions now filter the discussion and post
name and subject.
- get_forum_discussions_paginated
- get_forum_discussion_posts
2016-07-14 09:14:59 +01:00
Stephen Bourget 365e6b1c49 MDL-54657 Behat: Add tests for section_links block 2016-07-13 21:40:15 -04:00
Michael Aherne 4063900e2b MDL-55161 assign: Check for existence of gradebook feedback plugin 2016-07-13 09:03:44 +01:00
Andrew Nicols 0949754d1f Merge branch 'MDL-47371-30-fix' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-07-13 12:11:51 +08:00
Cameron Ball bcfca5e67d MDL-47371 mod_book: Fix out of scope $unescapedtitle 2016-07-13 10:28:54 +08:00
Damyon Wiese 373d1eb7d0 MDL-52544 oracle: Apply upstream pull request to AdoDB oracle driver
Upstream: https://github.com/ADOdb/ADOdb/pull/259

Prevent segfault with ocipo driver on php7.

The OCIFetchinto function is causing segfaults on php7 - probably because the fields array
is not initialised or it is optimised out. This fixes just changes to use the safer function
oci_fetch_array instead.
2016-07-13 08:46:40 +08:00
Stephen Bourget 27f6cc4519 MDL-51410 mod_survey: fix notifications when saving analysis 2016-07-12 20:09:26 -04:00
tunele 28027d45ea MDL-55083 admin: provide friendly error in case phpxml is missing 2016-07-13 00:09:52 +02:00
Eloy Lafuente (stronk7) 9251dcc986 MDL-53803 mod_choice: fix trailing whitespace 2016-07-12 18:06:29 +02:00
Eloy Lafuente (stronk7) 970a714e13 Merge branch 'MDL-53803_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE 2016-07-12 18:02:52 +02:00
Eloy Lafuente (stronk7) acc2203622 Merge branch 'MDL-54892-MOODLE_30_STABLE' of https://github.com/tobiasreischmann/moodle into MOODLE_30_STABLE 2016-07-12 17:51:56 +02:00
Eloy Lafuente (stronk7) ad857b10c3 Merge branch 'MDL-55136_dataobject_30' of git://github.com/davosmith/moodle into MOODLE_30_STABLE 2016-07-12 15:48:30 +02:00
Eloy Lafuente (stronk7) 726051dcf9 MDL-37250 mod_lesson: Move conditions to queries for better performance
While this ony seems to affect MySQL, better put the filter/conditions
on every query so the temporary view/table does not need to handle
thousands of potentially unrelated records.
2016-07-12 13:33:18 +02:00
Eloy Lafuente (stronk7) cd172ea20e Merge branch 'wip-MDL-37250-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-07-12 13:21:15 +02:00
David Monllao eee0dce093 Merge branch 'MDL-55133-30' of git://github.com/damyon/moodle into MOODLE_30_STABLE 2016-07-12 13:16:48 +02:00
Dan Poltawski 68adc36911 Merge branch 'MDL-47371-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-07-12 10:14:30 +01:00
David Monllao 3be99e4e7c Merge branch 'MDL-55170_M30' of https://github.com/nadavkav/moodle into MOODLE_30_STABLE 2016-07-12 10:30:59 +02:00
Dan Poltawski 8994550de2 Merge branch 'MDL-55007-m30' of https://github.com/dthies/moodle into MOODLE_30_STABLE 2016-07-12 09:21:08 +01:00
Cameron Ball bc63d5bc06 MDL-47371 mod_book: Don't double escape book titles 2016-07-12 10:34:43 +08:00
Cameron Ball 469a0854e3 MDL-47371 block_navigation: Don't double escape course titles 2016-07-12 10:34:43 +08:00
Cameron Ball ce4ff71aa3 MDL-47371 weblib: Add option to disable escaping 2016-07-12 10:34:42 +08:00
Andrew Nicols f811e12a60 MDL-54915 core: JS Blocks must not used shared variables
The JS blocks in a template must _not_ use a shared variable as they can be
executed asynchronously and complete in any order.

Instead it is stored in the only local variable available - the current
context.

Since the context can be passed in from elsewhere, we namespace it to
reduce the chance of collission.
2016-07-12 10:01:52 +08:00
Daniel Thies 5654da6ca2 MDL-5507 filter_mathjaxloader: Add commeents for regexes 2016-07-11 13:23:07 -05:00
Nadav Kavalerchik 9a07482c0b MDL-55170 theme_bootstrapbase: Fix user enrollment dialog, RTL 2016-07-11 18:19:04 +03:00
David Monllao 16d219ac90 Merge branch 'wip-MDL-54962-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-07-11 16:16:07 +02:00
Dan Poltawski 069cc7b961 Merge branch 'MDL-55112-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE 2016-07-11 14:42:15 +01:00
Dan Poltawski cdf2cf7f39 Merge branch 'MDL-55137-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE 2016-07-11 14:37:59 +01:00
Dan Poltawski e72b815237 Merge branch 'MDL-55128-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE 2016-07-11 13:33:24 +01:00
Dan Poltawski 01a64e03ad Merge branch 'wip-MDL-55154-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE 2016-07-11 13:31:26 +01:00
Juan Leyva 39e110d145 MDL-55163 mod_assign: Fix mod_assign_copy_previous_attempts
- Not exposed via WS
- Have a bug when calling the api function
2016-07-11 10:30:51 +01:00
David Monllao eb0ac9cbe8 Merge branch 'MDL-54832-30' of https://github.com/nashtechdev01/moodle into MOODLE_30_STABLE 2016-07-11 06:47:47 +02:00
Adrian Greeve c77ade8587 MDL-37250 mod_lesson: All actual attempts on the lesson are displayed.
The lesson overview report now shows all attempts made including hitting
the page and immediately navigating away.
2016-07-11 08:21:23 +08:00
Adrian Greeve e0bf071213 MDL-54962 mod_data: Approval status is now translated.
It was using hardcoded English. Now it uses get_string.
2016-07-11 08:20:43 +08:00
AMOS bot d23f1b75f5 Automatically generated installer lang files 2016-07-11 00:06:14 +08:00
Davo Smith 32a5148e50 MDL-55136 data_object: fix param handling in fetch_all_helper 2016-07-09 09:19:48 +01:00
Adrian Greeve 40e105976c MDL-55154 mod_lesson: Lesson numerical response shows images. 2016-07-08 09:54:22 +08:00
Daniel Thies da0e1acfed MDL-55007 filter_mathjaxloader: Change unit test 2016-07-07 20:26:18 -05:00
Daniel Thies 28cdac1c6f MDL-55007 filter_mathjaxloader: Wrap nolink around each expresssion 2016-07-07 20:26:07 -05:00
Damyon Wiese 4aec01cc4c MDL-52544 oracle: php7 fixes for oci driver
These are our bugs actually - the oci docs are very clear that bound
params should be in-scope when oci_execute is called - and due to pass by value etc,
this was not true for our driver.

There is another bug that needed fixing - OCI barfs if null values are bound - this
can be avoided by setting them to '' which oci treats as null.

And finally - all our lob/clob/blob hacks were also binding to local "out-of-scope" vars.
2016-07-07 13:10:03 +08:00
Stephen Bourget 9cf520a2e0 MDL-53803 mod_choice: remove orphaned answers when removing options 2016-07-06 17:16:18 -04:00
Cameron Ball 574afbc75f MDL-55137: Update PHPDoc for external_format_text 2016-07-06 17:48:41 +08:00
Damyon Wiese 443feb7ee8 MDL-55133 javascript: Correctly use component names in requirejs
Core subsystems must use the 'core_' prefix always.
2016-07-06 10:29:35 +08:00
Loc Nguyen 744adf1bb6 MDL-54832 workshop: adding landmark for userplantable
Accessibility enhance: add an aria-label on the userplan table so
that it's accessible to me through my screen reader
2016-07-05 20:34:54 +07:00
Juan Leyva 66efea063b MDL-55128 course: Fix param type for shortname 2016-07-05 09:51:35 +01:00
Andrew Nicols 909c3269bd MDL-51242 messageinbound: Guess the port from hostspec
Existing language strings for the host component suggest that the host can
be provided in the format hostname:port, but we previously did not support
this.

This patch explodes the string based on the colon character and assumes
that if there are two parts, that they are in the format hostname:port.

Note: This does not attempt to deal with full host specifications (e.g.
protocol://hostname:port), as this is beyond the scope of this change.
2016-07-05 14:54:21 +08:00
Jun Pataleta 784c5b9889 MDL-55112 mod_forum: Query all forum fields to avoid debug messages 2016-07-04 15:23:40 +08:00
Tobias Reischmann 2dc2a2b663 MDL-54892 core: Pass proper parameter for plugin uninstall queries 2016-06-21 09:16:20 +02:00
Stephen Bourget 8730fd39b8 MDL-54656 Behat: Additional tests for advanced search 2016-06-12 21:06:04 -04:00
Stephen Bourget 781b74cf38 MDL-54656 Behat: Add tests for search_forums block 2016-06-12 21:05:45 -04:00
504 changed files with 10421 additions and 2164 deletions
+17
View File
@@ -0,0 +1,17 @@
*/**/yui/src/*/meta/
*/**/build/
node_modules/
vendor/
lib/editor/atto/yui/src/rangy/js/
lib/editor/tinymce/plugins/pdw/tinymce/
lib/editor/tinymce/tiny_mce/
lib/requirejs/
lib/yuilib/
lib/jquery/
lib/htmlpurifier/
lib/flowplayer/
lib/xhprof/
lib/amd/src/loglevel.js
lib/amd/src/mustache.js
theme/bootstrapbase/javascript/html5shiv.js
theme/bootstrapbase/amd/src/bootstrap.js
+172
View File
@@ -0,0 +1,172 @@
{
'env': {
'browser': true,
'amd': true
},
'globals': {
'M': true,
'Y': true
},
'rules': {
// See http://eslint.org/docs/rules/ for all rules and explanations of all
// rules.
// === Possible Errors ===
'comma-dangle': 'off',
'no-cond-assign': 'error',
'no-console': 'error',
'no-constant-condition': 'error',
'no-control-regex': 'error',
'no-debugger': 'error',
'no-dupe-args': 'error',
'no-dupe-keys': 'error',
'no-duplicate-case': 'error',
'no-empty': 'warn',
'no-empty-character-class': 'error',
'no-ex-assign': 'error',
'no-extra-boolean-cast': 'error',
'no-extra-parens': 'off',
'no-extra-semi': 'error',
'no-func-assign': 'error',
'no-inner-declarations': 'error',
'no-invalid-regexp': 'error',
'no-irregular-whitespace': 'error',
'no-negated-in-lhs': 'error',
'no-obj-calls': 'error',
'no-prototype-builtins': 'off',
'no-regex-spaces': 'error',
'no-sparse-arrays': 'error',
'no-unexpected-multiline': 'error',
'no-unreachable': 'warn',
'no-unsafe-finally': 'error',
'use-isnan': 'error',
'valid-jsdoc': ['warn', { 'requireReturn': false, 'requireParamDescription': false, 'requireReturnDescription': false }],
'valid-typeof': 'error',
// === Best Practices ===
// (these mostly match our jshint config)
'array-callback-return': 'warn',
'block-scoped-var': 'warn',
'complexity': 'warn',
'consistent-return': 'warn',
'curly': 'error',
'dot-notation': 'warn',
'no-alert': 'warn',
'no-caller': 'error',
'no-case-declarations': 'error',
'no-div-regex': 'error',
'no-empty-pattern': 'error',
'no-empty-function': 'warn',
'no-eq-null': 'error',
'no-eval': 'error',
'no-extend-native': 'error',
'no-extra-bind': 'warn',
'no-fallthrough': 'error',
'no-floating-decimal': 'warn',
// Enabled by grunt for AMD modules: 'no-implicit-globals': 'error',
'no-implied-eval': 'error',
'no-invalid-this': 'error',
'no-iterator': 'error',
'no-labels': 'error',
'no-loop-func': 'error',
'no-multi-spaces': 'warn',
'no-multi-str': 'error',
'no-native-reassign': 'warn',
'no-new-func': 'error',
'no-new-wrappers': 'error',
'no-octal': 'error',
'no-octal-escape': 'error',
'no-proto': 'error',
'no-redeclare': 'warn',
'no-return-assign': 'error',
'no-script-url': 'error',
'no-self-assign': 'error',
'no-self-compare': 'error',
'no-sequences': 'warn',
'no-throw-literal': 'warn',
'no-unmodified-loop-condition': 'error',
'no-unused-expressions': 'error',
'no-unused-labels': 'error',
'no-useless-call': 'warn',
'no-useless-escape': 'warn',
'no-with': 'error',
'wrap-iife': ['error', 'any'],
// === Variables ===
'no-delete-var': 'error',
'no-undef': 'error',
'no-undef-init': 'error',
'no-unused-vars': ['error', { 'caughtErrors': 'none' }],
// === Stylistic Issues ===
'array-bracket-spacing': 'warn',
'block-spacing': 'warn',
'brace-style': ['warn', '1tbs'],
'camelcase': 'warn',
'comma-spacing': ['warn', { 'before': false, 'after': true }],
'comma-style': ['warn', 'last'],
'computed-property-spacing': 'error',
'consistent-this': 'off',
'eol-last': 'off',
'func-names': 'off',
'func-style': 'off',
// indent currently not doing well with our wrapping style, so disabled.
'indent': ['off', 4, { 'SwitchCase': 1 }],
'key-spacing': ['warn', { 'beforeColon': false, 'afterColon': true, 'mode': minimum }],
'keyword-spacing': 'warn',
'linebreak-style': ['error', 'unix'],
'lines-around-comment': 'off',
'max-len': ['error', 132],
'max-lines': 'off',
'max-depth': 'warn',
'max-nested-callbacks': ['warn', 5],
'max-params': 'off',
'max-statements': 'off',
'max-statements-per-line': ['warn', { max: 2 }],
'new-cap': ['warn', { 'properties': false }],
'new-parens': 'warn',
'newline-after-var': 'off',
'newline-before-return': 'off',
'newline-per-chained-call': 'off',
'no-array-constructor': 'off',
'no-bitwise': 'error',
'no-continue': 'off',
'no-inline-comments': 'off',
'no-lonely-if': 'off',
'no-mixed-operators': 'off',
'no-mixed-spaces-and-tabs': 'error',
'no-multiple-empty-lines': 'warn',
'no-negated-condition': 'off',
'no-nested-ternary': 'warn',
'no-new-object': 'off',
'no-plusplus': 'off',
'no-spaced-func': 'warn',
'no-ternary': 'off',
'no-trailing-spaces': 'error',
'no-underscore-dangle': 'off',
'no-unneeded-ternary': 'off',
'no-whitespace-before-property': 'warn',
'object-curly-newline': 'off',
'object-curly-spacing': 'warn',
'object-property-newline': 'off',
'one-var': 'off',
'one-var-declaration-per-line': ['warn', 'initializations'],
'operator-assignment': 'off',
'operator-linebreak': 'off',
'padded-blocks': 'off',
'quote-props': ['warn', 'as-needed', {'unnecessary': false, 'keywords': true, 'numbers': true}],
'quotes': 'off',
'require-jsdoc': 'warn',
'semi': 'error',
'semi-spacing': ['warn', {'before': false, 'after': true}],
'sort-vars': 'off',
'space-before-blocks': 'warn',
'space-before-function-paren': ['warn', 'never'],
'space-in-parens': 'warn',
'space-infix-ops': 'warn',
'space-unary-ops': 'warn',
'spaced-comment': 'warn',
'unicode-bom': 'error',
'wrap-regex': 'off',
}
}
+30 -13
View File
@@ -35,15 +35,20 @@ env:
# Run unit tests on Postgres
- DB=pgsql TASK=PHPUNIT
# Run a check for unbuilt files with Grunt.
- DB=none TASK=GRUNT
matrix:
# Enable fast finish.
# This will fail the build if a single job fails (except those in allow_failures).
# It will not stop the jobs from running.
fast_finish: true
include:
# Run grunt/npm install on lowest supported npm version
- php: 7
env: DB=none TASK=GRUNT NVM_VERSION='0.10'
# Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
- php: 7
env: DB=none TASK=GRUNT NVM_VERSION='node'
exclude:
# MySQL - it's just too slow.
# Exclude it on all versions except for 7.0
@@ -68,14 +73,26 @@ install:
# Disable xdebug. We aren't generating code coverage, and it has a huge impact upon test performance.
- rm /home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
# Set the encrypted GITHUB_TOKEN if it's available to raise the API limit.
- if [ -n "$GITHUB_APITOKEN" ]; then composer config github-oauth.github.com $GITHUB_APITOKEN; fi
- echo 'auth.json' >> .git/info/exclude
- >
if [ "$TASK" = 'PHPUNIT' ];
then
if [ -n "$GITHUB_APITOKEN" ]; then
composer config github-oauth.github.com $GITHUB_APITOKEN;
echo 'auth.json' >> .git/info/exclude
fi
# Install composer dependencies.
# We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
# Typically it should be able to use the Composer cache if any other job has already completed before we started here.
- travis_retry composer install --prefer-dist --no-interaction
# Install composer dependencies.
# We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
# Typically it should be able to use the Composer cache if any other job has already completed before we started here.
travis_retry composer install --prefer-dist --no-interaction;
fi
- >
if [ "$TASK" = 'GRUNT' ];
then
nvm install $NVM_VERSION ;
nvm use $NVM_VERSION ;
fi
before_script:
- >
@@ -142,9 +159,8 @@ before_script:
- >
if [ "$TASK" = 'GRUNT' ];
then
npm install ;
npm install -g grunt ;
grunt ;
npm install --no-spin;
npm install --no-spin -g grunt ;
fi
########################################################################
@@ -197,6 +213,7 @@ script:
- >
if [ "$TASK" = 'GRUNT' ];
then
grunt ;
# Add all files to the git index and then run diff --cached to see all changes.
# This ensures that we get the status of all files, including new files.
git add . ;
+4 -1
View File
@@ -154,7 +154,10 @@
$settings = '<a href="' . $blocksettings->url . '">' . get_string('settings') . '</a>';
} else if ($blocksettings instanceof admin_settingpage) {
$settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
} else {
} else if (!file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
// If the block's settings node was not found, we check that the block really provides the settings.php file.
// Note that blocks can inject their settings to other nodes in the admin tree without using the default locations.
// This can be done by assigning null to $setting in settings.php and it is a valid case.
debugging('Warning: block_'.$block->name.' returns true in has_config() but does not provide a settings.php file',
DEBUG_DEVELOPER);
}
+6 -6
View File
@@ -51,25 +51,25 @@ Options:
Example:
\$sudo -u www-data /usr/bin/php admin/cli/reset_password.php
"; //TODO: localize - to be translated later when everything is finished
";
echo $help;
die;
}
cli_heading('Password reset'); // TODO: localize
$prompt = "enter username (manual authentication only)"; // TODO: localize
cli_heading('Password reset');
$prompt = "Enter username (manual authentication only)";
$username = cli_input($prompt);
if (!$user = $DB->get_record('user', array('auth'=>'manual', 'username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
cli_error("Can not find user '$username'");
}
$prompt = "Enter new password"; // TODO: localize
$prompt = "Enter new password";
$password = cli_input($prompt);
$errmsg = '';//prevent eclipse warning
if (!check_password_policy($password, $errmsg)) {
cli_error($errmsg);
cli_error(html_to_text($errmsg, 0));
}
$hashedpassword = hash_internal_user_password($password);
@@ -78,4 +78,4 @@ $DB->set_field('user', 'password', $hashedpassword, array('id'=>$user->id));
echo "Password changed\n";
exit(0); // 0 means success
exit(0); // 0 means success.
+203
View File
@@ -1145,6 +1145,11 @@
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="2.8" requires="2.2">
@@ -1418,6 +1423,11 @@
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="3.0" requires="2.2">
@@ -1434,6 +1444,7 @@
<VENDOR name="oracle" version="10.2" />
</DATABASE>
<PHP version="5.4.4" level="required">
<RESTRICT function="restrict_php_version_71" message="unsupportedphpversion71" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@@ -1556,6 +1567,11 @@
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="3.1" requires="2.7">
@@ -1572,6 +1588,7 @@
<VENDOR name="oracle" version="10.2" />
</DATABASE>
<PHP version="5.4.4" level="required">
<RESTRICT function="restrict_php_version_71" message="unsupportedphpversion71" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@@ -1696,6 +1713,11 @@
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="3.2" requires="2.7">
@@ -1841,6 +1863,187 @@
<ON_CHECK message="unoconvwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="3.3" requires="2.7">
<UNICODE level="required">
<FEEDBACK>
<ON_ERROR message="unicoderequired" />
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
<VENDOR name="mariadb" version="5.5.31" />
<VENDOR name="mysql" version="5.5.31" />
<VENDOR name="postgres" version="9.3" />
<VENDOR name="mssql" version="10.0" />
<VENDOR name="oracle" version="10.2" />
</DATABASE>
<PHP version="5.6.5" level="required">
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
<ON_CHECK message="pcreunicodewarning" />
</FEEDBACK>
</PCREUNICODE>
<PHP_EXTENSIONS>
<PHP_EXTENSION name="iconv" level="required">
<FEEDBACK>
<ON_ERROR message="iconvrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="mbstring" level="optional">
<FEEDBACK>
<ON_CHECK message="mbstringrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="curl" level="required">
<FEEDBACK>
<ON_ERROR message="curlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="openssl" level="required">
<FEEDBACK>
<ON_ERROR message="opensslrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="tokenizer" level="optional">
<FEEDBACK>
<ON_CHECK message="tokenizerrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="xmlrpc" level="optional">
<FEEDBACK>
<ON_CHECK message="xmlrpcrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="soap" level="optional">
<FEEDBACK>
<ON_CHECK message="soaprecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="ctype" level="required">
<FEEDBACK>
<ON_ERROR message="ctyperequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zip" level="required">
<FEEDBACK>
<ON_ERROR message="ziprequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zlib" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="gd" level="required">
<FEEDBACK>
<ON_ERROR message="gdrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="simplexml" level="required">
<FEEDBACK>
<ON_ERROR message="simplexmlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="spl" level="required">
<FEEDBACK>
<ON_ERROR message="splrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="pcre" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="dom" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xml" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xmlreader" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="intl" level="optional">
<FEEDBACK>
<ON_CHECK message="intlrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="json" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="hash" level="required"/>
<PHP_EXTENSION name="fileinfo" level="required"/>
</PHP_EXTENSIONS>
<PHP_SETTINGS>
<PHP_SETTING name="memory_limit" value="96M" level="required">
<FEEDBACK>
<ON_ERROR message="settingmemorylimit" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="file_uploads" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="settingfileuploads" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="opcache.enable" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="opcacherecommended" />
</FEEDBACK>
</PHP_SETTING>
</PHP_SETTINGS>
<CUSTOM_CHECKS>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbstorageengine" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
<FEEDBACK>
<ON_ERROR message="quizattemptsupgradedmessage" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
<FEEDBACK>
<ON_CHECK message="slashargumentswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
<FEEDBACK>
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
<FEEDBACK>
<ON_CHECK message="unoconvwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfileformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfilepertable" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddblargeprefix" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
<FEEDBACK>
<ON_CHECK message="ishttpswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
<FEEDBACK>
<ON_CHECK message="incompleteunicodesupport" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
+6
View File
@@ -52,6 +52,12 @@ if (!function_exists('json_encode') || !function_exists('json_decode')) {
die();
}
// Make sure xml extension is available.
if (!extension_loaded('xml')) {
echo 'Moodle requires the xml PHP extension. Please install or enable the xml extension.';
die();
}
define('NO_OUTPUT_BUFFERING', true);
if (isset($_POST['upgradekey'])) {
+2 -1
View File
@@ -60,7 +60,8 @@ class mnet_simple_host_form extends moodleform {
}
if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
global $CFG;
return array('wwwroot' => get_string('hostexists', 'mnet', $CFG->wwwroot . '/admin/mnet/peers.php?hostid=' . $host->id));
return array('wwwroot' => get_string('hostexists', 'mnet',
new moodle_url('/admin/mnet/peers.php', array('hostid' => $host->id))));
}
return array();
}
+2 -2
View File
@@ -109,7 +109,7 @@ if (!empty($hostid)) {
$mnet_peer->set_id($hostid);
echo $OUTPUT->header();
$currenttab = 'mnetdetails';
require_once($CFG->dirroot . '/admin/mnet/tabs.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
if ($hostid != $CFG->mnet_all_hosts_id) {
$mnet_peer->currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
@@ -144,7 +144,7 @@ if (empty($noreviewform) && $id = optional_param('id', 0, PARAM_INT)) {
// we're editing an existing one, so set up the tabs
$currenttab = 'mnetdetails';
$mnet_peer->set_id($id);
require_once($CFG->dirroot . '/admin/mnet/tabs.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
} else if (empty($noreviewform) && ($wwwroot = optional_param('wwwroot', '', PARAM_URL)) && ($applicationid = optional_param('applicationid', 0, PARAM_INT))) {
$application = $DB->get_field('mnet_application', 'name', array('id'=>$applicationid));
$mnet_peer->bootstrap($wwwroot, null, $application);
+1 -1
View File
@@ -26,7 +26,7 @@
require(dirname(dirname(dirname(__FILE__))).'/config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot . '/admin/mnet/profilefields_form.php');
require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php');
$mnet = get_mnet_environment();
require_login();
+2 -2
View File
@@ -27,7 +27,7 @@
require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot . '/admin/mnet/services_form.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php');
$mnet = get_mnet_environment();
require_login();
@@ -82,7 +82,7 @@ if ($formdata = $mform->get_data()) {
echo $OUTPUT->header();
$currenttab = 'mnetservices';
require_once($CFG->dirroot . '/admin/mnet/tabs.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
echo $OUTPUT->box_start();
$s = mnet_get_service_info($mnet_peer, false); // basic data only
$mform->set_data($s);
+2
View File
@@ -32,6 +32,8 @@ $getroles = optional_param('getroles', 0, PARAM_BOOL);
list($context, $course, $cm) = get_context_info_array($contextid);
$PAGE->set_context($context);
require_login($course, false, $cm);
require_capability('moodle/role:review', $context);
require_sesskey();
+1 -1
View File
@@ -32,7 +32,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$ADMIN->add('development', $temp);
// "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).
$xhprofenabled = extension_loaded('xhprof') && function_exists('xhprof_enable');
$xhprofenabled = extension_loaded('xhprof') || extension_loaded('tideways');
$temp = new admin_settingpage('profiling', new lang_string('profiling', 'admin'), 'moodle/site:config', !$xhprofenabled);
// Main profiling switch.
$temp->add(new admin_setting_configcheckbox('profilingenabled', new lang_string('profilingenabled', 'admin'), new lang_string('profilingenabled_help', 'admin'), false));
+1 -1
View File
@@ -109,7 +109,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
// "httpsecurity" settingpage
$temp = new admin_settingpage('httpsecurity', new lang_string('httpsecurity', 'admin'));
$temp->add(new admin_setting_configcheckbox('loginhttps', new lang_string('loginhttps', 'admin'), new lang_string('configloginhttps', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 1));
$temp->add(new admin_setting_configcheckbox('cookiehttponly', new lang_string('cookiehttponly', 'admin'), new lang_string('configcookiehttponly', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('allowframembedding', new lang_string('allowframembedding', 'admin'), new lang_string('allowframembedding_help', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', new lang_string('loginpasswordautocomplete', 'admin'), new lang_string('loginpasswordautocomplete_help', 'admin'), 0));
+6 -4
View File
@@ -27,9 +27,12 @@ if ($primaryadmin) {
$primaryadminemail = NULL;
$primaryadminname = NULL;
}
$temp->add(new admin_setting_configtext('supportname', new lang_string('supportname', 'admin'), new lang_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
$temp->add(new admin_setting_configtext('supportemail', new lang_string('supportemail', 'admin'), new lang_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_NOTAGS));
$temp->add(new admin_setting_configtext('supportpage', new lang_string('supportpage', 'admin'), new lang_string('configsupportpage', 'admin'), '', PARAM_URL));
$temp->add(new admin_setting_configtext('supportname', new lang_string('supportname', 'admin'),
new lang_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
$temp->add(new admin_setting_configtext('supportemail', new lang_string('supportemail', 'admin'),
new lang_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_EMAIL));
$temp->add(new admin_setting_configtext('supportpage', new lang_string('supportpage', 'admin'),
new lang_string('configsupportpage', 'admin'), '', PARAM_URL));
$ADMIN->add('server', $temp);
@@ -78,7 +81,6 @@ $temp->add(new admin_setting_configselect('statsmaxruntime', new lang_string('st
60*60*7 => '7 '.new lang_string('hours'),
60*60*8 => '8 '.new lang_string('hours') )));
$temp->add(new admin_setting_configtext('statsruntimedays', new lang_string('statsruntimedays', 'admin'), new lang_string('configstatsruntimedays', 'admin'), 31, PARAM_INT));
$temp->add(new admin_setting_configtime('statsruntimestarthour', 'statsruntimestartminute', new lang_string('statsruntimestart', 'admin'), new lang_string('configstatsruntimestart', 'admin'), array('h' => 0, 'm' => 0)));
$temp->add(new admin_setting_configtext('statsuserthreshold', new lang_string('statsuserthreshold', 'admin'), new lang_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
$ADMIN->add('server', $temp);
@@ -184,6 +184,8 @@ class controller {
if ($updated) {
$this->info[] = get_string('langupdatecomplete', 'tool_langimport');
// The strings have been changed so we need to purge their cache to ensure users see the changes.
get_string_manager()->reset_caches();
} else {
$this->info[] = get_string('nolangupdateneeded', 'tool_langimport');
}
@@ -97,6 +97,15 @@ class manager {
'secure' => $CFG->messageinbound_hostssl,
);
if (strpos($configuration['hostspec'], ':')) {
$hostdata = explode(':', $configuration['hostspec']);
if (count($hostdata) === 2) {
// A hostname in the format hostname:port has been provided.
$configuration['hostspec'] = $hostdata[0];
$configuration['port'] = $hostdata[1];
}
}
$this->client = new \Horde_Imap_Client_Socket($configuration);
try {
+5 -4
View File
@@ -103,15 +103,16 @@ class eventlist {
foreach ($pluginlist as $plugin => $directory) {
$plugindirectory = $directory . '/classes/event';
foreach (self::get_file_list($plugindirectory) as $eventname => $notused) {
$plugineventname = '\\' . $plugintype . '_' . $plugin . '\\event\\' . $eventname;
$fullpluginname = $plugintype . '_' . $plugin;
$plugineventname = '\\' . $fullpluginname . '\\event\\' . $eventname;
// Check that this is actually an event.
if (method_exists($plugineventname, 'get_static_info') && $plugin != 'monitor') { // No selfie here.
if (method_exists($plugineventname, 'get_static_info') && $fullpluginname !== 'tool_monitor') { // No selfie here.
$ref = new \ReflectionClass($plugineventname);
if (!$ref->isAbstract() && $plugin != 'legacy') {
if (!$ref->isAbstract() && $fullpluginname !== 'logstore_legacy') {
if ($withoutcomponent) {
$noncorepluginlist[$plugineventname] = $plugineventname::get_name();
} else {
$noncorepluginlist[$plugintype . '_' . $plugin][$plugineventname] = $plugineventname::get_name();
$noncorepluginlist[$fullpluginname][$plugineventname] = $plugineventname::get_name();
}
}
}
@@ -199,7 +199,7 @@ class check_subscriptions extends \core\task\scheduled_task {
*/
protected function is_user_setup($user) {
if (!isset($this->userssetupcache[$user->id])) {
$this->userssetupcache[$user->id] = !user_not_fully_set_up($user);
$this->userssetupcache[$user->id] = !user_not_fully_set_up($user, true);
}
return $this->userssetupcache[$user->id];
}
+1 -1
View File
@@ -24,7 +24,7 @@
require_once(__DIR__ . '/../../../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot . '/admin/tool/monitor/lib.php');
require_once($CFG->dirroot.'/'.$CFG->admin.'/tool/monitor/lib.php');
$courseid = optional_param('courseid', 0, PARAM_INT);
$action = optional_param('action', '', PARAM_ALPHA);
@@ -384,7 +384,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
// Now let us trigger 7 instances of the event.
$event = \mod_book\event\course_module_instance_list_viewed::create_from_course($course);
$event->trigger();
sleep(1); // Add a second delay, to prevent time collisions.
$this->waitForSecond(); // Add a second delay, to prevent time collisions.
}
$this->run_adhock_tasks();
$messages = $messagesink->get_messages();
+3 -2
View File
@@ -26,6 +26,7 @@
defined('MOODLE_INTERNAL') || die;
// profiling tool, added to development
if (extension_loaded('xhprof') && function_exists('xhprof_enable') && (!empty($CFG->profilingenabled) || !empty($CFG->earlyprofilingenabled))) {
$ADMIN->add('development', new admin_externalpage('toolprofiling', get_string('pluginname', 'tool_profiling'), "$CFG->wwwroot/$CFG->admin/tool/profiling/index.php", 'moodle/site:config'));
if ((extension_loaded('xhprof') || extension_loaded('tideways')) && (!empty($CFG->profilingenabled) || !empty($CFG->earlyprofilingenabled))) {
$ADMIN->add('development', new admin_externalpage('toolprofiling', get_string('pluginname', 'tool_profiling'),
"$CFG->wwwroot/$CFG->admin/tool/profiling/index.php", 'moodle/site:config'));
}
+1 -1
View File
@@ -1 +1 @@
define(["jquery","core/ajax","core/log","core/notification","core/templates","core/config","core/str"],function(a,b,c,d,e,f,g){var h=function(a,b){var c="@template "+b,d=0,e=[];if(e=a.match(/{{!([\s\S]*?)}}/g),null!==e)for(d=0;d<e.length;d++){var f=e[d],g=f.indexOf(c);if(-1!==g){var h=g+c.length+1;return f=f.substr(h,f.length-2-h)}}return!1},i=function(b,f,i){g.get_string("templateselected","tool_templatelibrary",b).done(function(b){a('[data-region="displaytemplateheader"]').text(b)}).fail(d.exception);var j=h(f,b);j===!1&&(j=h(i,b)),j&&(f=j),a('[data-region="displaytemplatesource"]').text(f);var k=f.match(/Example context \(json\):([\s\S]*)/),l=!1;if(k){var m=k[1].trim();try{l=a.parseJSON(m)}catch(n){c.debug("Could not parse json example context for template."),c.debug(n)}}l?e.render(b,l).done(function(b,c){e.replaceNodeContents(a('[data-region="displaytemplateexample"]'),b,c)}).fail(d.exception):g.get_string("templatehasnoexample","tool_templatelibrary").done(function(b){a('[data-region="displaytemplateexample"]').text(b)}).fail(d.exception)},j=function(c){var e=c.split("/"),g=e.shift(),h=e.shift(),j=b.call([{methodname:"core_output_load_template",args:{component:g,template:h,themename:f.theme}},{methodname:"tool_templatelibrary_load_canonical_template",args:{component:g,template:h}}],!0,!1);a.when.apply(a,j).done(function(a,b){i(c,a,b)}).fail(d.exception)};return a('[data-region="list-templates"]').on("click","[data-templatename]",function(b){var c=a(this).data("templatename");b.preventDefault(),j(c)}),{}});
define(["jquery","core/ajax","core/log","core/notification","core/templates","core/config","core/str"],function(a,b,c,d,e,f,g){var h=function(a,b){if(!a)return!1;var c="@template "+b,d=0,e=[];if(e=a.match(/{{!([\s\S]*?)}}/g),null!==e)for(d=0;d<e.length;d++){var f=e[d],g=f.indexOf(c);if(-1!==g){var h=g+c.length+1;return f=f.substr(h,f.length-2-h)}}return!1},i=function(b,f,i){g.get_string("templateselected","tool_templatelibrary",b).done(function(b){a('[data-region="displaytemplateheader"]').text(b)}).fail(d.exception);var j=h(f,b);j===!1&&(j=h(i,b)),j&&(f=j),a('[data-region="displaytemplatesource"]').text(f);var k=f.match(/Example context \(json\):([\s\S]*)/),l=!1;if(k){var m=k[1].trim();try{l=a.parseJSON(m)}catch(n){c.debug("Could not parse json example context for template."),c.debug(n)}}l?e.render(b,l).done(function(b,c){e.replaceNodeContents(a('[data-region="displaytemplateexample"]'),b,c)}).fail(d.exception):g.get_string("templatehasnoexample","tool_templatelibrary").done(function(b){a('[data-region="displaytemplateexample"]').text(b)}).fail(d.exception)},j=function(c){var e=c.split("/"),g=e.shift(),h=e.shift(),j=b.call([{methodname:"core_output_load_template",args:{component:g,template:h,themename:f.theme}},{methodname:"tool_templatelibrary_load_canonical_template",args:{component:g,template:h}}],!0,!1);a.when.apply(a,j).done(function(a,b){i(c,a,b)}).fail(d.exception)};return a('[data-region="list-templates"]').on("click","[data-templatename]",function(b){var c=a(this).data("templatename");b.preventDefault(),j(c)}),{}});
+1 -1
View File
@@ -1 +1 @@
define(["jquery","core/ajax","core/log","core/notification","core/templates"],function(a,b,c,d,e){var f=function(b){e.render("tool_templatelibrary/search_results",{templates:b}).done(function(b,c){e.replaceNode(a('[data-region="searchresults"]'),b,c)}).fail(d.exception)},g=function(){var c=a('[data-field="component"]').val(),e=a('[data-field="search"]').val();b.call([{methodname:"tool_templatelibrary_list_templates",args:{component:c,search:e},done:f,fail:d.exception}],!0,!1)},h=null,i=function(a,b){null!==h&&window.clearTimeout(h),h=window.setTimeout(function(){a(),h=null},b)},j=function(){i(g,400)};return a('[data-region="list-templates"]').on("change",'[data-field="component"]',j),a('[data-region="list-templates"]').on("input",'[data-field="search"]',j),g(),{}});
define(["jquery","core/ajax","core/log","core/notification","core/templates","core/config"],function(a,b,c,d,e,f){var g=function(b){e.render("tool_templatelibrary/search_results",{templates:b}).done(function(b,c){e.replaceNode(a('[data-region="searchresults"]'),b,c)}).fail(d.exception)},h=function(c){var e=a('[data-field="component"]').val(),f=a('[data-field="search"]').val();b.call([{methodname:"tool_templatelibrary_list_templates",args:{component:e,search:f,themename:c},done:g,fail:d.exception}],!0,!1)},i=null,j=function(a,b){null!==i&&window.clearTimeout(i),i=window.setTimeout(function(){a(),i=null},b)},k=function(){j(h.bind(this,f.theme),400)};return a('[data-region="list-templates"]').on("change",'[data-field="component"]',k),a('[data-region="list-templates"]').on("input",'[data-field="search"]',k),h(f.theme),{}});
@@ -33,6 +33,9 @@ define(['jquery', 'core/ajax', 'core/log', 'core/notification', 'core/templates'
*/
var findDocsSection = function(templateSource, templateName) {
if (!templateSource) {
return false;
}
// Find the comment section marked with @template component/template.
var marker = "@template " + templateName,
i = 0,
+6 -7
View File
@@ -21,8 +21,8 @@
* @copyright 2015 Damyon Wiese <damyon@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define(['jquery', 'core/ajax', 'core/log', 'core/notification', 'core/templates'],
function($, ajax, log, notification, templates) {
define(['jquery', 'core/ajax', 'core/log', 'core/notification', 'core/templates', 'core/config'],
function($, ajax, log, notification, templates, config) {
/**
* The ajax call has returned with a new list of templates.
@@ -42,15 +42,14 @@ define(['jquery', 'core/ajax', 'core/log', 'core/notification', 'core/templates'
*
* @method refreshSearch
*/
var refreshSearch = function() {
var refreshSearch = function(themename) {
var componentStr = $('[data-field="component"]').val();
var searchStr = $('[data-field="search"]').val();
// Trigger the search.
ajax.call([
{ methodname: 'tool_templatelibrary_list_templates',
args: { component: componentStr, search: searchStr },
args: { component: componentStr, search: searchStr, themename: themename },
done: reloadListTemplate,
fail: notification.exception }
], true, false);
@@ -78,12 +77,12 @@ define(['jquery', 'core/ajax', 'core/log', 'core/notification', 'core/templates'
};
var changeHandler = function() {
queueRefresh(refreshSearch, 400);
queueRefresh(refreshSearch.bind(this, config.theme), 400);
};
// Add change handlers to refresh the list.
$('[data-region="list-templates"]').on('change', '[data-field="component"]', changeHandler);
$('[data-region="list-templates"]').on('input', '[data-field="search"]', changeHandler);
refreshSearch();
refreshSearch(config.theme);
return {};
});
+22 -9
View File
@@ -47,7 +47,12 @@ class api {
* @return array[string] Where each template is in the form "component/templatename".
*/
public static function list_templates($component = '', $search = '', $themename = '') {
global $CFG;
global $CFG, $PAGE;
if (empty($themename)) {
$themename = $PAGE->theme->name;
}
$themeconfig = \theme_config::load($themename);
$templatedirs = array();
$results = array();
@@ -77,6 +82,9 @@ class api {
foreach ($plugintypes as $type => $dir) {
$plugins = core_component::get_plugin_list_with_file($type, 'templates', false);
foreach ($plugins as $plugin => $dir) {
if ($type == 'theme' && $plugin != $themename && !in_array($plugin, $themeconfig->parents)) {
continue;
}
if (!empty($dir) && is_dir($dir)) {
$pluginname = $type . '_' . $plugin;
$dirs = mustache_template_finder::get_template_directories_for_component($pluginname, $themename);
@@ -111,25 +119,30 @@ class api {
*
* @param string $component The component that holds the template.
* @param string $template The name of the template.
* @return string the template
* @return string the template or false if template doesn't exist.
*/
public static function load_canonical_template($component, $template) {
// Get the list of possible template directories.
$dirs = mustache_template_finder::get_template_directories_for_component($component);
$filename = false;
$themedir = core_component::get_plugin_types()['theme'];
foreach ($dirs as $dir) {
// Skip theme dirs - we only want the original plugin/core template.
if (strpos($dir, "/theme/") === false) {
$candidate = $dir . $template . '.mustache';
if (file_exists($candidate)) {
$filename = $candidate;
break;
}
if (strpos($dir, $themedir) === 0) {
continue;
}
$candidate = $dir . $template . '.mustache';
if (file_exists($candidate)) {
$filename = $candidate;
break;
}
}
if ($filename === false) {
throw new moodle_exception('filenotfound', 'error');
// There are occasions where we don't have a core template.
return false;
}
$templatestr = file_get_contents($filename);
@@ -59,7 +59,13 @@ class external extends external_api {
VALUE_DEFAULT,
''
);
$params = array('component' => $component, 'search' => $search);
$themename = new external_value(
PARAM_COMPONENT,
'The current theme',
VALUE_DEFAULT,
''
);
$params = array('component' => $component, 'search' => $search, 'themename' => $themename);
return new external_function_parameters($params);
}
@@ -67,16 +73,18 @@ class external extends external_api {
* Loads the list of templates.
* @param string $component Limit the search to a component.
* @param string $search The search string.
* @param string $themename The name of theme
* @return array[string]
*/
public static function list_templates($component, $search) {
public static function list_templates($component, $search, $themename = '') {
$params = self::validate_parameters(self::list_templates_parameters(),
array(
'component' => $component,
'search' => $search,
'themename' => $themename,
));
return api::list_templates($component, $search);
return api::list_templates($component, $search, $themename);
}
/**
@@ -107,7 +115,7 @@ class external extends external_api {
*
* @param string $component The component that holds the template.
* @param string $template The name of the template.
* @return string the template
* @return string the template, false if template doesn't exist.
*/
public static function load_canonical_template($component, $template) {
$params = self::validate_parameters(self::load_canonical_template_parameters(),
+5 -5
View File
@@ -582,6 +582,11 @@ class tool_uploadcourse_course {
}
}
// Course start date.
if (!empty($coursedata['startdate'])) {
$coursedata['startdate'] = strtotime($coursedata['startdate']);
}
// Ultimate check mode vs. existence.
switch ($mode) {
case tool_uploadcourse_processor::MODE_CREATE_NEW:
@@ -631,11 +636,6 @@ class tool_uploadcourse_course {
$this->do = self::DO_CREATE;
}
// Course start date.
if (!empty($coursedata['startdate'])) {
$coursedata['startdate'] = strtotime($coursedata['startdate']);
}
// Add role renaming.
$errors = array();
$rolenames = tool_uploadcourse_helper::get_role_names($this->rawdata, $errors);
@@ -425,7 +425,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
'fullname' => 'Fullname',
'category' => '1',
'visible' => '0',
'startdate' => '8 June 1990',
'startdate' => 644803200,
'idnumber' => '123abc',
'summary' => 'Summary',
'format' => 'weeks',
@@ -452,7 +452,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
$this->assertEquals($defaultdata['fullname'], $course->fullname);
$this->assertEquals($defaultdata['category'], $course->category);
$this->assertEquals($defaultdata['visible'], $course->visible);
$this->assertEquals(mktime(0, 0, 0, 6, 8, 1990), $course->startdate);
$this->assertEquals($defaultdata['startdate'], $course->startdate);
$this->assertEquals($defaultdata['idnumber'], $course->idnumber);
$this->assertEquals($defaultdata['summary'], $course->summary);
$this->assertEquals($defaultdata['format'], $course->format);
@@ -478,7 +478,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
'fullname' => 'Fullname 2',
'category' => $cat->id,
'visible' => '1',
'startdate' => '11 June 1984',
'startdate' => 455760000,
'idnumber' => 'changedid',
'summary' => 'Summary 2',
'format' => 'topics',
@@ -505,7 +505,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
$this->assertEquals($defaultdata['fullname'], $course->fullname);
$this->assertEquals($defaultdata['category'], $course->category);
$this->assertEquals($defaultdata['visible'], $course->visible);
$this->assertEquals(mktime(0, 0, 0, 6, 11, 1984), $course->startdate);
$this->assertEquals($defaultdata['startdate'], $course->startdate);
$this->assertEquals($defaultdata['idnumber'], $course->idnumber);
$this->assertEquals($defaultdata['summary'], $course->summary);
$this->assertEquals($defaultdata['format'], $course->format);
+21 -17
View File
@@ -302,18 +302,24 @@ class auth_plugin_db extends auth_plugin_base {
// Find obsolete users.
if (count($userlist)) {
$remove_users = array();
// All the drivers can cope with chunks of 10,000. See line 4491 of lib/dml/tests/dml_est.php
$userlistchunks = array_chunk($userlist , 10000);
foreach($userlistchunks as $userlistchunk) {
list($notin_sql, $params) = $DB->get_in_or_equal($userlistchunk, SQL_PARAMS_NAMED, 'u', false);
$params['authtype'] = $this->authtype;
$sql = "SELECT u.id, u.username
$removeusers = array();
$params['authtype'] = $this->authtype;
$sql = "SELECT u.id, u.username
FROM {user} u
WHERE u.auth=:authtype AND u.deleted=0 AND u.mnethostid=:mnethostid $suspendselect AND u.username $notin_sql";
$params['mnethostid'] = $CFG->mnet_localhost_id;
$remove_users = $remove_users + $DB->get_records_sql($sql, $params);
WHERE u.auth=:authtype
AND u.deleted=0
AND u.mnethostid=:mnethostid
$suspendselect";
$params['mnethostid'] = $CFG->mnet_localhost_id;
$internalusersrs = $DB->get_recordset_sql($sql, $params);
$usernamelist = array_flip($userlist);
foreach ($internalusersrs as $internaluser) {
if (!array_key_exists($internaluser->username, $usernamelist)) {
$removeusers[] = $internaluser;
}
}
$internalusersrs->close();
} else {
$sql = "SELECT u.id, u.username
FROM {user} u
@@ -321,13 +327,13 @@ class auth_plugin_db extends auth_plugin_base {
$params = array();
$params['authtype'] = $this->authtype;
$params['mnethostid'] = $CFG->mnet_localhost_id;
$remove_users = $DB->get_records_sql($sql, $params);
$removeusers = $DB->get_records_sql($sql, $params);
}
if (!empty($remove_users)) {
$trace->output(get_string('auth_dbuserstoremove','auth_db', count($remove_users)));
if (!empty($removeusers)) {
$trace->output(get_string('auth_dbuserstoremove', 'auth_db', count($removeusers)));
foreach ($remove_users as $user) {
foreach ($removeusers as $user) {
if ($this->config->removeuser == AUTH_REMOVEUSER_FULLDELETE) {
delete_user($user);
$trace->output(get_string('auth_dbdeleteuser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)), 1);
@@ -341,7 +347,7 @@ class auth_plugin_db extends auth_plugin_base {
}
}
}
unset($remove_users);
unset($removeusers);
}
if (!count($userlist)) {
@@ -950,5 +956,3 @@ class auth_plugin_db extends auth_plugin_base {
return $user;
}
}
+1 -1
View File
@@ -1780,7 +1780,7 @@ class auth_plugin_ldap extends auth_plugin_base {
unset_cache_flag($this->pluginconfig.'/ntlmsess', $key);
// Redirection
if (user_not_fully_set_up($USER)) {
if (user_not_fully_set_up($USER, true)) {
$urltogo = $CFG->wwwroot.'/user/edit.php';
// We don't delete $SESSION->wantsurl yet, so we get there later
} else if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)) {
+1 -1
View File
@@ -260,7 +260,7 @@ class auth_plugin_mnet extends auth_plugin_base {
exit;
}
if (user_not_fully_set_up($remoteuser)) {
if (user_not_fully_set_up($remoteuser, false)) {
print_error('notenoughidpinfo', 'mnet');
exit;
}
+1 -1
View File
@@ -54,7 +54,7 @@
&& $user = authenticate_user_login($frm->username, $frm->password)) {
complete_user_login($user);
if (user_not_fully_set_up($USER)) {
if (user_not_fully_set_up($USER, true)) {
$urltogo = $CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.SITEID;
// We don't delete $SESSION->wantsurl yet, so we get there later
+7 -2
View File
@@ -34,6 +34,10 @@ defined('MOODLE_INTERNAL') || die();
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class tree_node {
/** @var int Counter to be used in {@link tree_node::unique_sql_parameter()}. */
protected static $uniquesqlparametercounter = 1;
/**
* Determines whether this particular item is currently available
* according to the availability criteria.
@@ -242,10 +246,11 @@ abstract class tree_node {
* @return SQL code for the parameter, e.g. ':pr1234'
*/
protected static function unique_sql_parameter(array &$params, $value) {
static $count = 1;
// Note we intentionally do not use self:: here.
$count = tree_node::$uniquesqlparametercounter++;
$unique = 'usp' . $count;
$params[$unique] = $value;
$count++;
return ':' . $unique;
}
}
+57
View File
@@ -675,6 +675,63 @@ class tree_testcase extends \advanced_testcase {
json_encode(tree::get_root_json(array($child, $child), tree::OP_AND, array(true, false))));
}
/**
* Tests the behaviour of the counter in unique_sql_parameter().
*
* There was a problem with static counters used to implement a sequence of
* parameter placeholders (MDL-53481). As always with static variables, it
* is a bit tricky to unit test the behaviour reliably as it depends on the
* actual tests executed and also their order.
*
* To minimise risk of false expected behaviour, this test method should be
* first one where {@link core_availability\tree::get_user_list_sql()} is
* used. We also use higher number of condition instances to increase the
* risk of the counter collision, should there remain a problem.
*/
public function test_unique_sql_parameter_behaviour() {
global $DB;
$this->resetAfterTest();
$generator = $this->getDataGenerator();
// Create a test course with multiple groupings and groups and a student in each of them.
$course = $generator->create_course();
$user = $generator->create_user();
$studentroleid = $DB->get_field('role', 'id', array('shortname' => 'student'));
$generator->enrol_user($user->id, $course->id, $studentroleid);
// The total number of groupings and groups must not be greater than 61.
// There is a limit in MySQL on the max number of joined tables.
$groups = [];
for ($i = 0; $i < 25; $i++) {
$group = $generator->create_group(array('courseid' => $course->id));
groups_add_member($group, $user);
$groups[] = $group;
}
$groupings = [];
for ($i = 0; $i < 25; $i++) {
$groupings[] = $generator->create_grouping(array('courseid' => $course->id));
}
foreach ($groupings as $grouping) {
foreach ($groups as $group) {
groups_assign_grouping($grouping->id, $group->id);
}
}
$info = new \core_availability\mock_info($course);
// Make a huge tree with 'AND' of all groups and groupings conditions.
$conditions = [];
foreach ($groups as $group) {
$conditions[] = \availability_group\condition::get_json($group->id);
}
foreach ($groupings as $groupingid) {
$conditions[] = \availability_grouping\condition::get_json($grouping->id);
}
shuffle($conditions);
$tree = new tree(tree::get_root_json($conditions));
list($sql, $params) = $tree->get_user_list_sql(false, $info, false);
// This must not throw exception.
$DB->fix_sql_params($sql, $params);
}
/**
* Tests get_user_list_sql.
*/
+1 -1
View File
@@ -381,7 +381,7 @@ class cc2moodle {
if (!empty($format['defaultblocks'])) {
$blocknames = $format['defaultblocks'];
} else {
if (!empty($CFG->defaultblocks)) {
if (isset($CFG->defaultblocks)) {
$blocknames = $CFG->defaultblocks;
} else {
$blocknames = 'participants,activity_modules,search_forums,course_list:news_items,calendar_upcoming,recent_activity';
-1
View File
@@ -145,7 +145,6 @@ if ($backup->get_stage() == backup_ui::STAGE_FINAL) {
if (!empty($precheckresults['errors'])) { // If errors are found, terminate the import.
fulldelete($tempdestination);
echo $OUTPUT->header();
echo $renderer->precheck_notices($precheckresults);
echo $OUTPUT->continue_button(new moodle_url('/course/view.php', array('id'=>$course->id)));
echo $OUTPUT->footer();
+6 -2
View File
@@ -93,7 +93,9 @@ if ($action == 'choosebackupfile') {
// If it's some weird other kind of file then use old code.
$filename = restore_controller::get_tempdir_name($courseid, $USER->id);
$pathname = $tmpdir . '/' . $filename;
$fileinfo->copy_to_pathname($pathname);
if (!$fileinfo->copy_to_pathname($pathname)) {
throw new restore_ui_exception('errorcopyingbackupfile', null, $pathname);
}
$restore_url = new moodle_url('/backup/restore.php', array(
'contextid' => $contextid, 'filename' => $filename));
}
@@ -115,7 +117,9 @@ $data = $form->get_data();
if ($data && has_capability('moodle/restore:uploadfile', $context)) {
$filename = restore_controller::get_tempdir_name($courseid, $USER->id);
$pathname = $tmpdir . '/' . $filename;
$form->save_file('backupfile', $pathname);
if (!$form->save_file('backupfile', $pathname)) {
throw new restore_ui_exception('errorcopyingbackupfile', null, $pathname);
}
$restore_url = new moodle_url('/backup/restore.php', array('contextid'=>$contextid, 'filename'=>$filename));
redirect($restore_url);
die;
@@ -105,6 +105,12 @@ abstract class backup_controller_dbops extends backup_dbops {
throw new backup_dbops_exception('backup_controller_dbops_nonexisting');
}
$controller = unserialize(base64_decode($controllerrec->controller));
if (!is_object($controller)) {
// The controller field of the table did not contain a serialized object.
// It is made empty after it has been used successfully, it is likely that
// the user has pressed the browser back button at some point.
throw new backup_dbops_exception('backup_controller_dbops_loading_invalid_controller');
}
// Check checksum is ok. Sounds silly but it isn't ;-)
if (!$controller->is_checksum_correct($controllerrec->checksum)) {
throw new backup_dbops_exception('backup_controller_dbops_loading_checksum_mismatch');
@@ -95,6 +95,12 @@ abstract class restore_controller_dbops extends restore_dbops {
throw new backup_dbops_exception('restore_controller_dbops_nonexisting');
}
$controller = unserialize(base64_decode($controllerrec->controller));
if (!is_object($controller)) {
// The controller field of the table did not contain a serialized object.
// It is made empty after it has been used successfully, it is likely that
// the user has pressed the browser back button at some point.
throw new backup_dbops_exception('restore_controller_dbops_loading_invalid_controller');
}
// Check checksum is ok. Sounds silly but it isn't ;-)
if (!$controller->is_checksum_correct($controllerrec->checksum)) {
throw new backup_dbops_exception('restore_controller_dbops_loading_checksum_mismatch');
+1 -1
View File
@@ -793,7 +793,7 @@ abstract class restore_dbops {
// Prepare the query
list($stamp_sql, $stamp_params) = $DB->get_in_or_equal($stamps);
list($context_sql, $context_params) = $DB->get_in_or_equal($contexts);
$sql = "SELECT contextid
$sql = "SELECT DISTINCT contextid
FROM {question_categories}
WHERE stamp $stamp_sql
AND contextid $context_sql";
+2 -1
View File
@@ -95,7 +95,8 @@ class backup_logger_testcase extends basic_testcase {
$lo3 = new mock_base_logger3(backup::LOG_ERROR);
$lo1->set_next($lo2);
$lo2->set_next($lo3);
$this->assertFalse($lo1->process('test', backup::LOG_ERROR));
$msg = 13;
$this->assertFalse($lo1->process($msg, backup::LOG_ERROR));
// Test checksum correct
$lo1 = new mock_base_logger1(backup::LOG_ERROR);
+1 -1
View File
@@ -48,7 +48,7 @@ class award_criteria_activity extends award_criteria {
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid), MUST_EXIST);
$this->courseid = $this->course->id;
}
+2 -2
View File
@@ -50,7 +50,7 @@ class award_criteria_course extends award_criteria {
$this->course = $DB->get_record_sql('SELECT c.id, c.enablecompletion, c.cacherev, c.startdate
FROM {badge} b INNER JOIN {course} c ON b.courseid = c.id
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid));
WHERE b.id = :badgeid ', array('badgeid' => $this->badgeid), MUST_EXIST);
$this->courseid = $this->course->id;
}
@@ -95,7 +95,7 @@ class award_criteria_course extends award_criteria {
* @return string
*/
public function get_details($short = '') {
global $DB;
global $DB, $OUTPUT;
$param = reset($this->params);
$course = $DB->get_record('course', array('id' => $param['course']));
+7 -4
View File
@@ -207,12 +207,15 @@ class award_criteria_manual extends award_criteria {
return array($join, $where, $params);
} else {
foreach ($this->params as $param) {
$join .= " LEFT JOIN {badge_manual_award} bma{$param['role']} ON
bma{$param['role']}.recipientid = u.id AND
bma{$param['role']}.issuerrole = :issuerrole{$param['role']} ";
$where .= " AND bma{$param['role']}.issuerrole IS NOT NULL ";
$roledata[] = " bma.issuerrole = :issuerrole{$param['role']} ";
$params["issuerrole{$param['role']}"] = $param['role'];
}
if (!empty($roledata)) {
$extraon = implode(' AND ', $roledata);
$join = " JOIN {badge_manual_award} bma ON bma.recipientid = u.id
AND bma.badgeid = :badgeid{$this->badgeid} AND ({$extraon})";
$params["badgeid{$this->badgeid}"] = $this->badgeid;
}
return array($join, $where, $params);
}
}
+1 -1
View File
@@ -160,7 +160,7 @@ if ($type == BADGE_TYPE_SITE) {
}
echo $OUTPUT->box('', 'notifyproblem hide', 'check_connection');
$totalcount = count(badges_get_badges($type, $courseid, '', '' , '', ''));
$totalcount = count(badges_get_badges($type, $courseid, '', '' , 0, 0));
$records = badges_get_badges($type, $courseid, $sortby, $sorthow, $page, BADGE_PERPAGE);
if ($totalcount) {
+41
View File
@@ -288,6 +288,47 @@ class core_badges_badgeslib_testcase extends advanced_testcase {
// The term Totara doesn't appear anywhere in the badges.
$result = badges_get_user_badges($user2->id, 0, 0, 0, 'Totara');
$this->assertCount(0, $result);
// Issue a user with a course badge and verify its returned based on if
// coursebadges are enabled or disabled.
$sitebadgeid = key($badges);
$badges[$sitebadgeid]->issue($this->user->id, true);
$badge = new stdClass();
$badge->id = null;
$badge->name = "Test course badge";
$badge->description = "Testing course badge";
$badge->timecreated = $now;
$badge->timemodified = $now;
$badge->usercreated = $user1->id;
$badge->usermodified = $user1->id;
$badge->issuername = "Test issuer";
$badge->issuerurl = "http://issuer-url.domain.co.nz";
$badge->issuercontact = "issuer@example.com";
$badge->expiredate = null;
$badge->expireperiod = null;
$badge->type = BADGE_TYPE_COURSE;
$badge->courseid = $this->course->id;
$badge->messagesubject = "Test message subject for course badge";
$badge->message = "Test message body for course badge";
$badge->attachment = 1;
$badge->notification = 0;
$badge->status = BADGE_STATUS_ACTIVE;
$badgeid = $DB->insert_record('badge', $badge, true);
$badges[$badgeid] = new badge($badgeid);
$badges[$badgeid]->issue($this->user->id, true);
// With coursebadges off, we should only get the site badge.
set_config('badges_allowcoursebadges', false);
$result = badges_get_user_badges($this->user->id);
$this->assertCount(1, $result);
// With it on, we should get both.
set_config('badges_allowcoursebadges', true);
$result = badges_get_user_badges($this->user->id);
$this->assertCount(2, $result);
}
public function data_for_message_from_template() {
+83
View File
@@ -231,3 +231,86 @@ Feature: Award badges
And I log in as "student1"
And I follow "Profile" in the user menu
Then I should see "Course Badge"
@javascript
Scenario: All of the selected roles can award badges
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
And the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
# Create course badge 1.
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I follow "Add a new badge"
And I set the following fields to these values:
| Name | Course Badge 1 |
| Description | Course badge description |
| issuername | Tester of course badge |
And I upload "badges/tests/behat/badge.png" file to "Image" filemanager
And I press "Create badge"
And I set the field "type" to "Manual issue by role"
And I expand all fieldsets
# Set to ANY of the roles awards badge.
And I set the field "Teacher" to "1"
And I set the field "Any of the selected roles awards the badge" to "1"
And I press "Save"
And I press "Enable access"
And I press "Continue"
And I follow "Recipients (0)"
And I press "Award badge"
# Award course badge 1 to student 1.
And I set the field "potentialrecipients[]" to "Student 1 (student1@example.com)"
When I press "Award badge"
And I follow "Course Badge 1"
And I follow "Recipients (1)"
Then I should see "Recipients (1)"
# Add course badge 2.
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I follow "Add a new badge"
And I set the following fields to these values:
| Name | Course Badge 2 |
| Description | Course badge description |
| issuername | Tester of course badge |
And I upload "badges/tests/behat/badge.png" file to "Image" filemanager
And I press "Create badge"
And I set the field "type" to "Manual issue by role"
And I expand all fieldsets
# Set to ALL of the selected roles award badge.
And I set the field "Teacher" to "1"
And I set the field "All of the selected roles award the badge" to "1"
And I press "Save"
And I press "Enable access"
And I press "Continue"
And I follow "Recipients (0)"
And I press "Award badge"
# Award course badge 2 to student 2.
And I set the field "potentialrecipients[]" to "Student 2 (student2@example.com)"
When I press "Award badge"
And I follow "Course Badge 2"
And I follow "Recipients (1)"
Then I should see "Recipients (1)"
And I log out
And I trigger cron
# Student 1 should have just course badge 1.
And I log in as "student1"
And I follow "Profile" in the user menu
When I follow "Course 1"
Then I should see "Course Badge 1"
And I should not see "Course Badge 2"
And I log out
# Student 2 should have just course badge 2.
And I log in as "student2"
And I follow "Profile" in the user menu
When I follow "Course 1"
Then I should see "Course Badge 2"
Then I should not see "Course Badge 1"
+1 -1
View File
@@ -83,7 +83,7 @@ $output = $PAGE->get_renderer('core', 'badges');
echo $output->header();
echo $OUTPUT->heading($title);
$totalcount = count(badges_get_badges($type, $courseid, '', '', '', '', $USER->id));
$totalcount = count(badges_get_badges($type, $courseid, '', '', 0, 0, $USER->id));
$records = badges_get_badges($type, $courseid, $sortby, $sorthow, $page, BADGE_PERPAGE, $USER->id);
if ($totalcount) {
@@ -64,7 +64,7 @@ class block_course_overview extends block_base {
$content = array();
$updatemynumber = optional_param('mynumber', -1, PARAM_INT);
if ($updatemynumber >= 0) {
if ($updatemynumber >= 0 && optional_param('sesskey', '', PARAM_RAW) && confirm_sesskey()) {
block_course_overview_update_mynumber($updatemynumber);
}
+1 -1
View File
@@ -86,7 +86,7 @@ function block_course_overview_get_myorder() {
// If preference was not found, look in the old location and convert if found.
$order = array();
if ($value = get_user_preferences('course_overview_course_order')) {
$order = unserialize($value);
$order = unserialize_array($value);
block_course_overview_update_myorder($order);
unset_user_preference('course_overview_course_order');
}
+1 -1
View File
@@ -213,7 +213,7 @@ class block_course_overview_renderer extends plugin_renderer_base {
for ($i = 1; $i <= $max; $i++) {
$options[$i] = $i;
}
$url = new moodle_url('/my/index.php');
$url = new moodle_url('/my/index.php', ['sesskey' => sesskey()]);
$select = new single_select($url, 'mynumber', $options, block_course_overview_get_max_user_courses(), array());
$select->set_label(get_string('numtodisplay', 'block_course_overview'));
$output .= $this->output->render($select);
@@ -86,7 +86,7 @@ class block_glossary_random extends block_base {
switch ($this->config->type) {
case BGR_RANDOMLY:
$i = rand(1,$numberofentries);
$i = ($numberofentries > 1) ? rand(1, $numberofentries) : 1;
$limitfrom = $i-1;
break;
@@ -0,0 +1,45 @@
@block @block_navigation
Feature: Displaying the link to the Participants page
In order to see the course / site participants
As a student / admin respectively
I need a link to the Participants page be displayed (but only if I can access that page)
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Student | One | student1@example.com |
| student2 | Student | Two | student2@example.com |
And the following "courses" exist:
| fullname | shortname |
| Course1 | C1 |
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
@javascript
Scenario: Course participants link is displayed to enrolled students after expanding the course node
When I log in as "student1"
And I expand "C1" node
Then "Participants" "link" should exist in the "Navigation" "block"
And I navigate to "Participants" node in "My courses > C1"
And I should see "Participants"
And "Student One" "link" should exist
And "Student Two" "link" should not exist
Scenario: Site participants link is displayed to admins
When I log in as "admin"
Then "Participants" "link" should exist in the "Navigation" "block"
And I navigate to "Participants" node in "Site pages"
And I should see "Participants"
And "Student One" "link" should exist
And "Student Two" "link" should exist
@javascript
Scenario: Site participants link is not displayed to students (MDL-55667)
Given I log in as "admin"
And I set the following administration settings values:
| defaultfrontpageroleid | Student (student) |
And I log out
When I log in as "student2"
And I expand "Site pages" node
Then "Participants" "link" should not exist in the "Navigation" "block"
@@ -158,7 +158,8 @@ Feature: View structural changes in recent activity block
And I should see "Added Forum" in the "Recent activity" "block"
And I should see "ForumNew" in the "Recent activity" "block"
And I log out
# Update forum as a teacher
# Update forum as a teacher after a second to ensure we have a new timestamp for recent activity.
And I wait "1" seconds
And I log in as "teacher1"
And I follow "Course 1"
And I follow "ForumNew"
+2 -1
View File
@@ -56,7 +56,8 @@ class block_rss_client_edit_form extends block_edit_form {
$params += $inparams;
}
$titlesql = "CASE WHEN preferredtitle = '' THEN {$DB->sql_compare_text('title', 64)} ELSE preferredtitle END";
$titlesql = "CASE WHEN {$DB->sql_isempty('block_rss_client','preferredtitle', false, false)}
THEN {$DB->sql_compare_text('title', 64)} ELSE preferredtitle END";
$rssfeeds = $DB->get_records_sql_menu("
SELECT id, $titlesql
@@ -0,0 +1,69 @@
@block @block_search_forums @mod_forum
Feature: The search forums block allows users to search for forum posts
In order to search for a forum post
As a user
I can use the search forums block
Background:
Given the following "users" exist:
| username | firstname | lastname | email | idnumber |
| teacher1 | Teacher | 1 | teacher1@example.com | T1 |
| student1 | Student | 1 | student1@example.com | S1 |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Edit settings" node in "Course administration"
And I set the field "id_newsitems" to "1"
And I press "Save and display"
And I log out
Scenario: Use the search forum block in a course without any forum posts
Given I log in as "student1"
And I follow "Course 1"
When I set the following fields to these values:
| searchform_search | Moodle |
And I press "Go"
Then I should see "No posts"
Scenario: Use the search forum block in a course with a hidden forum and search for posts
Given I log in as "teacher1"
And I follow "Course 1"
And I add a new topic to "News forum" forum with:
| Subject | My subject |
| Message | My message |
And I follow "Course 1"
And I turn editing mode on
And I follow "News forum"
And I navigate to "Edit settings" node in "Forum administration"
And I expand all fieldsets
And I set the field "id_visible" to "0"
And I press "Save and return to course"
And I log out
When I log in as "student1"
And I follow "Course 1"
And "Search forums" "block" should exist
And I set the following fields to these values:
| searchform_search | message |
And I press "Go"
Then I should see "No posts"
Scenario: Use the search forum block in a course and search for posts
Given I log in as "teacher1"
And I follow "Course 1"
And I add a new topic to "News forum" forum with:
| Subject | My subject |
| Message | My message |
And I log out
When I log in as "student1"
And I follow "Course 1"
And "Search forums" "block" should exist
And I set the following fields to these values:
| searchform_search | message |
And I press "Go"
Then I should see "My subject"
@@ -0,0 +1,31 @@
@block @block_search_forums @mod_forum
Feature: The search forums block allows users to search for forum posts
In order to search for a forum post
As an administrator
I can add the search forums block
Background:
Given the following "users" exist:
| username | firstname | lastname | email | idnumber |
| student1 | Student | 1 | student1@example.com | S1 |
And I log in as "admin"
And I am on site homepage
And I navigate to "Turn editing on" node in "Front page settings"
And I add the "Search forums" block
And I log out
Scenario: Use the search forum block on the frontpage and search for posts as a user
Given I log in as "student1"
And I am on site homepage
When I set the following fields to these values:
| searchform_search | Moodle |
And I press "Go"
Then I should see "No posts"
Scenario: Use the search forum block on the frontpage and search for posts as a guest
Given I log in as "guest"
And I am on site homepage
When I set the following fields to these values:
| searchform_search | Moodle |
And I press "Go"
Then I should see "No posts"
@@ -0,0 +1,64 @@
@block @block_section_links
Feature: The section links block allows users to quickly navigate around a moodle course
In order to navigate a moodle course
As a teacher
I can use the section links block
Background:
Given the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
And I add a "Assignment" to section "5" and I fill the form with:
| Assignment name | Test assignment 1 |
| Description | Offline text |
| assignsubmission_file_enabled | 0 |
And I navigate to "Edit settings" node in "Course administration"
And I set the following fields to these values:
| id_numsections | 20 |
| id_coursedisplay | Show one section per page |
And I press "Save and display"
Scenario: Add the section links block to a course.
Given I add the "Section links" block
And I turn editing mode off
And I should see "5" in the "Section links" "block"
When I follow "5"
Then I should see "Test assignment 1"
Scenario: Add the section links block to a course and limit the sections displayed.
Given I add the "Section links" block
And I configure the "Section links" block
And I set the following fields to these values:
| id_config_numsections1 | 5 |
| id_config_incby1 | 5 |
| id_config_numsections2 | 40 |
| id_config_incby2 | 10 |
And I press "Save changes"
And I turn editing mode off
And I should see "5" in the "Section links" "block"
When I follow "5"
Then I should see "Test assignment 1"
Scenario: Add the section links block to a course and limit the sections displayed using the alternative number of sections.
Given I add the "Section links" block
And I configure the "Section links" block
And I set the following fields to these values:
| id_config_numsections1 | 5 |
| id_config_incby1 | 1 |
| id_config_numsections2 | 10 |
| id_config_incby2 | 5 |
And I press "Save changes"
And I turn editing mode off
And I should see "5" in the "Section links" "block"
When I follow "5"
Then I should see "Test assignment 1"
+7 -1
View File
@@ -1,6 +1,12 @@
.block_site_main_menu li { clear: both; }
.block_site_main_menu li .column { width: 100%; }
.block_site_main_menu li .buttons { float: right; margin: 0; }
.block_site_main_menu li .buttons {
float: right;
margin: 0;
padding: 0;
border: 0;
background-color: inherit;
}
.dir-rtl .block_site_main_menu li .buttons { float: left; }
.block_site_main_menu li .buttons a img{ vertical-align: text-bottom;}
.block_site_main_menu .footer { margin-top: 1em; }
@@ -68,7 +68,7 @@ Feature: Add and configure blocks throughout the site
And I add the "HTML" block
And I configure the "(new HTML block)" block
And I set the following fields to these values:
| Block title | Foo " onload="document.getElementsByTagName('body')[0].remove()" alt="
| Content | Example
| Block title | Foo " onload="document.getElementsByTagName('body')[0].remove()" alt=" |
| Content | Example |
When I press "Save changes"
Then I should see "Course overview"
+1 -1
View File
@@ -78,7 +78,7 @@ if (empty($CFG->enableblogs)) {
}
if (isguestuser()) {
print_error('noguestentry', 'blog');
print_error('noguest');
}
$returnurl = new moodle_url('/blog/index.php');
+5 -5
View File
@@ -53,11 +53,11 @@ $action = (empty($id)) ? 'add' : 'edit';
$external = new stdClass();
// Check that this id exists.
if (!empty($id) && !$DB->record_exists('blog_external', array('id' => $id))) {
print_error('wrongexternalid', 'blog');
} else if (!empty($id)) {
$external = $DB->get_record('blog_external', array('id' => $id));
// Retrieve the external blog record.
if (!empty($id)) {
if (!$external = $DB->get_record('blog_external', array('id' => $id, 'userid' => $USER->id))) {
print_error('wrongexternalid', 'blog');
}
}
$strformheading = ($action == 'edit') ? get_string('editexternalblog', 'blog') : get_string('addnewexternalblog', 'blog');
+1 -1
View File
@@ -36,7 +36,7 @@ class blog_edit_external_form extends moodleform {
$mform =& $this->_form;
$mform->addElement('url', 'url', get_string('url', 'blog'), array('size' => 50));
$mform->addElement('url', 'url', get_string('url', 'blog'), array('size' => 50), array('usefilepicker' => false));
$mform->setType('url', PARAM_URL);
$mform->addRule('url', get_string('emptyurl', 'blog'), 'required', null, 'client');
$mform->addHelpButton('url', 'url', 'blog');
+1 -1
View File
@@ -93,7 +93,7 @@ if ($CFG->bloglevel == BLOG_GLOBAL_LEVEL) {
require_login();
if (isguestuser()) {
// They must have entered the url manually.
print_error('blogdisable', 'blog');
print_error('noguest');
}
} else if ($CFG->bloglevel == BLOG_USER_LEVEL) {
+1 -1
View File
@@ -873,7 +873,7 @@ function blog_get_headers($courseid=null, $groupid=null, $userid=null, $tagid=nu
}
// Append Search info.
if (!empty($search)) {
if (!empty($search) && has_capability('moodle/blog:search', $sitecontext)) {
$headers['filters']['search'] = $search;
$blogurl->param('search', $search);
$PAGE->navbar->add(get_string('searchterm', 'blog', $search), $blogurl->out());
+4
View File
@@ -63,6 +63,10 @@ if (empty($CFG->enableblogs)) {
print_error('blogdisable', 'blog');
}
if (isguestuser()) {
print_error('noguest');
}
// The preference is site wide not blog specific. Hence user should have permissions in site level.
require_capability('moodle/blog:view', $sitecontext);
+4 -2
View File
@@ -22,6 +22,8 @@
* @copyright 2010 Andrew Davis
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
require_once($CFG->dirroot.'/lib/rsslib.php');
require_once($CFG->dirroot .'/blog/lib.php');
@@ -209,7 +211,7 @@ function blog_rss_get_feed($context, $args) {
if ($blogentries) {
$items = array();
foreach ($blogentries as $blogentry) {
$item = null;
$item = new stdClass();
$item->author = fullname($DB->get_record('user', array('id' => $blogentry->userid))); // TODO: this is slow.
$item->title = $blogentry->subject;
$item->pubdate = $blogentry->lastmodified;
@@ -234,7 +236,7 @@ function blog_rss_get_feed($context, $args) {
switch ($type) {
case 'user':
$info = fullname($DB->get_record('user', array('id'=>$id), 'firstname,lastname'));
$info = fullname($DB->get_record('user', array('id'=>$id), get_all_user_name_fields(true)));
break;
case 'course':
$info = $DB->get_field('course', 'fullname', array('id'=>$id));
+2 -4
View File
@@ -781,10 +781,8 @@ class cache_definition {
}
}
if ($this->identifiers === null) {
// Initialize identifiers if they have not been.
$this->identifiers = array();
}
$this->identifiers = array();
foreach ($identifiers as $name => $value) {
$this->identifiers[$name] = (string)$value;
}
+3 -2
View File
@@ -161,6 +161,7 @@ class cache_factory {
$factory->reset_cache_instances();
$factory->configs = array();
$factory->definitions = array();
$factory->definitionstores = array();
$factory->lockplugins = array(); // MUST be null in order to force its regeneration.
// Reset the state to uninitialised.
$factory->state = self::STATE_UNINITIALISED;
@@ -198,7 +199,7 @@ class cache_factory {
}
$definition = $this->create_definition($component, $area);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition, $identifiers);
$cache = $this->create_cache($definition);
// Loaders are always held onto to speed up subsequent requests.
$this->cachesfromdefinitions[$definitionname] = $cache;
return $cache;
@@ -227,7 +228,7 @@ class cache_factory {
}
$definition = cache_definition::load_adhoc($mode, $component, $area, $options);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition, $identifiers);
$cache = $this->create_cache($definition);
$this->cachesfromparams[$key] = $cache;
return $cache;
}
+19 -11
View File
@@ -306,13 +306,14 @@ class cache implements cache_loader {
$result = $result->data;
}
}
if ($result instanceof cache_cached_object) {
$result = $result->restore_object();
}
if ($this->use_static_acceleration()) {
$this->static_acceleration_set($parsedkey, $result);
}
if ($result instanceof cache_cached_object) {
$result = $result->restore_object();
}
}
// 4. Load if from the loader/datasource if we don't already have it.
$setaftervalidation = false;
if ($result === false) {
@@ -405,12 +406,12 @@ class cache implements cache_loader {
$value = $value->data;
}
}
if ($value instanceof cache_cached_object) {
$value = $value->restore_object();
}
if ($value !== false && $this->use_static_acceleration()) {
$this->static_acceleration_set($key, $value);
}
if ($value instanceof cache_cached_object) {
$value = $value->restore_object();
}
$resultstore[$key] = $value;
}
}
@@ -828,11 +829,7 @@ class cache implements cache_loader {
*/
public function purge() {
// 1. Purge the static acceleration array.
$this->staticaccelerationarray = array();
if ($this->staticaccelerationsize !== false) {
$this->staticaccelerationkeys = array();
$this->staticaccelerationcount = 0;
}
$this->static_acceleration_purge();
// 2. Purge the store.
$this->store->purge();
// 3. Optionally pruge any stacked loaders.
@@ -1140,6 +1137,17 @@ class cache implements cache_loader {
return true;
}
/**
* Purge the static acceleration cache.
*/
protected function static_acceleration_purge() {
$this->staticaccelerationarray = array();
if ($this->staticaccelerationsize !== false) {
$this->staticaccelerationkeys = array();
$this->staticaccelerationcount = 0;
}
}
/**
* Returns the timestamp from the first request for the time from the cache API.
*
+4 -2
View File
@@ -213,7 +213,8 @@ class cache_factory_disabled extends cache_factory {
*/
public function create_cache_from_definition($component, $area, array $identifiers = array(), $unused = null) {
$definition = $this->create_definition($component, $area);
$cache = $this->create_cache($definition, $identifiers);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition);
return $cache;
}
@@ -233,7 +234,8 @@ class cache_factory_disabled extends cache_factory {
*/
public function create_cache_from_params($mode, $component, $area, array $identifiers = array(), array $options = array()) {
$definition = cache_definition::load_adhoc($mode, $component, $area);
$cache = $this->create_cache($definition, $identifiers);
$definition->set_identifiers($identifiers);
$cache = $this->create_cache($definition);
return $cache;
}
+1 -1
View File
@@ -691,7 +691,7 @@ abstract class cache_administration_helper extends cache_helper {
'plugin' => $details['plugin'],
'default' => $details['default'],
'isready' => $store->is_ready(),
'requirementsmet' => $store->are_requirements_met(),
'requirementsmet' => $class::are_requirements_met(),
'mappings' => 0,
'lock' => $lock,
'modes' => array(
+72 -2
View File
@@ -187,6 +187,35 @@ class core_cache_testcase extends advanced_testcase {
$this->assertEquals('test data 1', $cache->get('contest'));
}
/**
* Tests set_identifiers resets identifiers and static cache
*/
public function test_set_identifiers() {
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/identifier', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
'area' => 'identifier',
'simplekeys' => true,
'simpledata' => true,
'staticacceleration' => true
));
$cache = cache::make('phpunit', 'identifier', array('area'));
$this->assertTrue($cache->set('contest', 'test data 1'));
$this->assertEquals('test data 1', $cache->get('contest'));
$cache->set_identifiers(array());
$this->assertFalse($cache->get('contest'));
$this->assertTrue($cache->set('contest', 'empty ident'));
$this->assertEquals('empty ident', $cache->get('contest'));
$cache->set_identifiers(array('area'));
$this->assertEquals('test data 1', $cache->get('contest'));
$cache->set_identifiers(array());
$this->assertEquals('empty ident', $cache->get('contest'));
}
/**
* Tests the default application cache
*/
@@ -306,15 +335,17 @@ class core_cache_testcase extends advanced_testcase {
$this->assertTrue($cache->set($key, $dataobject));
$this->assertEquals($dataobject, $cache->get($key));
$specobject = new cache_phpunit_dummy_object('red', 'blue');
$starttime = microtime(true);
$specobject = new cache_phpunit_dummy_object('red', 'blue', $starttime);
$this->assertTrue($cache->set($key, $specobject));
$result = $cache->get($key);
$this->assertInstanceOf('cache_phpunit_dummy_object', $result);
$this->assertEquals('red_ptc_wfc', $result->property1);
$this->assertEquals('blue_ptc_wfc', $result->property2);
$this->assertGreaterThan($starttime, $result->propertytime);
// Test array of objects.
$specobject = new cache_phpunit_dummy_object('red', 'blue');
$specobject = new cache_phpunit_dummy_object('red', 'blue', $starttime);
$data = new cacheable_object_array(array(
clone($specobject),
clone($specobject),
@@ -328,6 +359,8 @@ class core_cache_testcase extends advanced_testcase {
$this->assertInstanceOf('cache_phpunit_dummy_object', $item);
$this->assertEquals('red_ptc_wfc', $item->property1);
$this->assertEquals('blue_ptc_wfc', $item->property2);
// Ensure that wake from cache is called in all cases.
$this->assertGreaterThan($starttime, $item->propertytime);
}
// Test set many.
@@ -1847,6 +1880,43 @@ class core_cache_testcase extends advanced_testcase {
$this->assertEquals('D', $cache->phpunit_static_acceleration_get('d'));
$this->assertEquals('E', $cache->phpunit_static_acceleration_get('e'));
// Store a cacheable_object, get many times and ensure each time wake_for_cache is used.
// Both get and get_many are tested. Two cache entries are used to ensure the times aren't
// confused with multiple calls to get()/get_many().
$startmicrotime = microtime(true);
$cacheableobject = new cache_phpunit_dummy_object(1, 1, $startmicrotime);
$cacheableobject2 = new cache_phpunit_dummy_object(2, 2, $startmicrotime);
$this->assertTrue($cache->set('a', $cacheableobject));
$this->assertTrue($cache->set('b', $cacheableobject2));
$staticaccelerationreturntime = $cache->phpunit_static_acceleration_get('a')->propertytime;
$staticaccelerationreturntimeb = $cache->phpunit_static_acceleration_get('b')->propertytime;
$this->assertGreaterThan($startmicrotime, $staticaccelerationreturntime, 'Restore time of static must be newer.');
// Reset the static cache without resetting backing store.
$cache->phpunit_static_acceleration_purge();
// Get the value from the backend store, populating the static cache.
$cachevalue = $cache->get('a');
$this->assertInstanceOf('cache_phpunit_dummy_object', $cachevalue);
$this->assertGreaterThan($staticaccelerationreturntime, $cachevalue->propertytime);
$backingstorereturntime = $cachevalue->propertytime;
$results = $cache->get_many(array('b'));
$this->assertInstanceOf('cache_phpunit_dummy_object', $results['b']);
$this->assertGreaterThan($staticaccelerationreturntimeb, $results['b']->propertytime);
$backingstorereturntimeb = $results['b']->propertytime;
// Obtain the value again and confirm that static cache is using wake_from_cache.
// Upon failure, the times are not adjusted as wake_from_cache is skipped as the
// value is stored serialized in the static acceleration cache.
$cachevalue = $cache->phpunit_static_acceleration_get('a');
$this->assertInstanceOf('cache_phpunit_dummy_object', $cachevalue);
$this->assertGreaterThan($backingstorereturntime, $cachevalue->propertytime);
$results = $cache->get_many(array('b'));
$this->assertInstanceOf('cache_phpunit_dummy_object', $results['b']);
$this->assertGreaterThan($backingstorereturntimeb, $results['b']->propertytime);
/** @var cache_phpunit_application $cache */
$cache = cache::make('phpunit', 'accelerated2');
$this->assertInstanceOf('cache_phpunit_application', $cache);
+44 -3
View File
@@ -308,6 +308,9 @@ class cache_config_phpunittest extends cache_config_testing {
/**
* Dummy object for testing cacheable object interface and interaction
*
* Wake from cache needs specific testing at times to ensure that during multiple
* cache get() requests it's possible to verify that it's getting woken each time.
*
* @copyright 2012 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -322,21 +325,27 @@ class cache_phpunit_dummy_object extends stdClass implements cacheable_object {
* @var string
*/
public $property2;
/**
* Test property time for verifying wake is run at each get() call.
* @var float
*/
public $propertytime;
/**
* Constructor
* @param string $property1
* @param string $property2
*/
public function __construct($property1, $property2) {
public function __construct($property1, $property2, $propertytime = null) {
$this->property1 = $property1;
$this->property2 = $property2;
$this->propertytime = $propertytime === null ? microtime(true) : $propertytime;
}
/**
* Prepares this object for caching
* @return array
*/
public function prepare_to_cache() {
return array($this->property1.'_ptc', $this->property2.'_ptc');
return array($this->property1.'_ptc', $this->property2.'_ptc', $this->propertytime);
}
/**
* Returns this object from the cache
@@ -344,7 +353,15 @@ class cache_phpunit_dummy_object extends stdClass implements cacheable_object {
* @return cache_phpunit_dummy_object
*/
public static function wake_from_cache($data) {
return new cache_phpunit_dummy_object(array_shift($data).'_wfc', array_shift($data).'_wfc');
$time = null;
if (!is_null($data[2])) {
// Windows 32bit microtime() resolution is 15ms, we ensure the time has moved forward.
do {
$time = microtime(true);
} while ($time == $data[2]);
}
return new cache_phpunit_dummy_object(array_shift($data).'_wfc', array_shift($data).'_wfc', $time);
}
}
@@ -426,6 +443,17 @@ class cache_phpunit_application extends cache_application {
$key = $this->parse_key($key);
return $this->static_acceleration_get($key);
}
/**
* Purges only the static acceleration while leaving the rest of the store in tack.
*
* Used for behaving like you have loaded 2 pages, and reset static while the backing store
* still contains all the same data.
*
*/
public function phpunit_static_acceleration_purge() {
$this->static_acceleration_purge();
}
}
/**
@@ -508,6 +536,11 @@ class cache_phpunit_factory extends cache_factory {
parent::disable();
}
/**
* @var bool Whether the warning notice about alternative cache store used has been displayed.
*/
protected $altcachestorenotice = false;
/**
* Creates a store instance given its name and configuration.
*
@@ -531,7 +564,15 @@ class cache_phpunit_factory extends cache_factory {
return $instance;
}
}
// Notify user that alternative store is being used, so action can be taken.
if (!$this->altcachestorenotice) {
echo PHP_EOL . "++ WARNING: " . 'Failed to use "' . $details['plugin'] . '" cache store, alt "' .
$details['alt']['plugin'] . '" cache store is used.' . PHP_EOL . PHP_EOL;
$this->altcachestorenotice = true;
}
$details = $details['alt'];
$details['class'] = 'cachestore_'.$details['plugin'];
$name = $details['name'];
}
+17 -10
View File
@@ -702,12 +702,12 @@ function calendar_get_events($tstart, $tend, $users, $groups, $courses, $withdur
// Events from a number of users
if(!empty($whereclause)) $whereclause .= ' OR';
list($insqlusers, $inparamsusers) = $DB->get_in_or_equal($users, SQL_PARAMS_NAMED);
$whereclause .= " (userid $insqlusers AND courseid = 0 AND groupid = 0)";
$whereclause .= " (e.userid $insqlusers AND e.courseid = 0 AND e.groupid = 0)";
$params = array_merge($params, $inparamsusers);
} else if($users === true) {
// Events from ALL users
if(!empty($whereclause)) $whereclause .= ' OR';
$whereclause .= ' (userid != 0 AND courseid = 0 AND groupid = 0)';
$whereclause .= ' (e.userid != 0 AND e.courseid = 0 AND e.groupid = 0)';
} else if($users === false) {
// No user at all, do nothing
}
@@ -716,24 +716,24 @@ function calendar_get_events($tstart, $tend, $users, $groups, $courses, $withdur
// Events from a number of groups
if(!empty($whereclause)) $whereclause .= ' OR';
list($insqlgroups, $inparamsgroups) = $DB->get_in_or_equal($groups, SQL_PARAMS_NAMED);
$whereclause .= " groupid $insqlgroups ";
$whereclause .= " e.groupid $insqlgroups ";
$params = array_merge($params, $inparamsgroups);
} else if($groups === true) {
// Events from ALL groups
if(!empty($whereclause)) $whereclause .= ' OR ';
$whereclause .= ' groupid != 0';
$whereclause .= ' e.groupid != 0';
}
// boolean false (no groups at all): we don't need to do anything
if ((is_array($courses) && !empty($courses)) or is_numeric($courses)) {
if(!empty($whereclause)) $whereclause .= ' OR';
list($insqlcourses, $inparamscourses) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED);
$whereclause .= " (groupid = 0 AND courseid $insqlcourses)";
$whereclause .= " (e.groupid = 0 AND e.courseid $insqlcourses)";
$params = array_merge($params, $inparamscourses);
} else if ($courses === true) {
// Events from ALL courses
if(!empty($whereclause)) $whereclause .= ' OR';
$whereclause .= ' (groupid = 0 AND courseid != 0)';
$whereclause .= ' (e.groupid = 0 AND e.courseid != 0)';
}
// Security check: if, by now, we have NOTHING in $whereclause, then it means
@@ -745,10 +745,10 @@ function calendar_get_events($tstart, $tend, $users, $groups, $courses, $withdur
}
if($withduration) {
$timeclause = '(timestart >= '.$tstart.' OR timestart + timeduration > '.$tstart.') AND timestart <= '.$tend;
$timeclause = '(e.timestart >= '.$tstart.' OR e.timestart + e.timeduration > '.$tstart.') AND e.timestart <= '.$tend;
}
else {
$timeclause = 'timestart >= '.$tstart.' AND timestart <= '.$tend;
$timeclause = 'e.timestart >= '.$tstart.' AND e.timestart <= '.$tend;
}
if(!empty($whereclause)) {
// We have additional constraints
@@ -760,10 +760,17 @@ function calendar_get_events($tstart, $tend, $users, $groups, $courses, $withdur
}
if ($ignorehidden) {
$whereclause .= ' AND visible = 1';
$whereclause .= ' AND e.visible = 1';
}
$events = $DB->get_records_select('event', $whereclause, $params, 'timestart');
$sql = "SELECT e.*
FROM {event} e
LEFT JOIN {modules} m ON e.modulename = m.name
-- Non visible modules will have a value of 0.
WHERE (m.visible = 1 OR m.visible IS NULL) AND $whereclause
ORDER BY e.timestart";
$events = $DB->get_records_sql($sql, $params);
if ($events === false) {
$events = array();
}
+1 -1
View File
@@ -224,7 +224,7 @@ class core_calendar_type_testcase extends advanced_testcase {
$el->_createElements();
$submitvalues = array('dateselector' => $date);
$this->assertSame($el->exportValue($submitvalues), array('dateselector' => $date['timestamp']));
$this->assertSame(array('dateselector' => $date['timestamp']), $el->exportValue($submitvalues, true));
}
/**
+60
View File
@@ -111,4 +111,64 @@ class core_calendar_lib_testcase extends advanced_testcase {
$this->expectOutputRegex('/Error updating calendar subscription: The given iCal URL is invalid/');
calendar_cron();
}
/**
* Test the calendar_get_events() function only returns activity
* events that are enabled.
*/
public function test_calendar_get_events_with_disabled_module() {
global $DB;
$course = $this->getDataGenerator()->create_course();
$events = [[
'name' => 'Start of assignment',
'description' => '',
'format' => 1,
'courseid' => $course->id,
'groupid' => 0,
'userid' => 2,
'modulename' => 'assign',
'instance' => 1,
'eventtype' => 'due',
'timestart' => time(),
'timeduration' => 86400,
'visible' => 1
], [
'name' => 'Start of lesson',
'description' => '',
'format' => 1,
'courseid' => $course->id,
'groupid' => 0,
'userid' => 2,
'modulename' => 'lesson',
'instance' => 1,
'eventtype' => 'end',
'timestart' => time(),
'timeduration' => 86400,
'visible' => 1
]
];
foreach ($events as $event) {
calendar_event::create($event, false);
}
$timestart = time() - 60;
$timeend = time() + 60;
// Get all events.
$events = calendar_get_events($timestart, $timeend, true, 0, true);
$this->assertCount(2, $events);
// Disable the lesson module.
$modulerecord = $DB->get_record('modules', ['name' => 'lesson']);
$modulerecord->visible = 0;
$DB->update_record('modules', $modulerecord);
// Check that we only return the assign event.
$events = calendar_get_events($timestart, $timeend, true, 0, true);
$this->assertCount(1, $events);
$event = reset($events);
$this->assertEquals('assign', $event->modulename);
}
}
+3 -2
View File
@@ -213,6 +213,7 @@ abstract class data_object {
$wheresql = array();
$dbparams = array();
foreach ($params as $var=>$value) {
if (!in_array($var, $instance->required_fields) and !array_key_exists($var, $instance->optional_fields)) {
continue;
@@ -221,7 +222,7 @@ abstract class data_object {
$wheresql[] = " $var IS NULL ";
} else {
$wheresql[] = " $var = ? ";
$params[] = $value;
$dbparams[] = $value;
}
}
@@ -232,7 +233,7 @@ abstract class data_object {
}
global $DB;
if ($datas = $DB->get_records_select($table, $wheresql, $params)) {
if ($datas = $DB->get_records_select($table, $wheresql, $dbparams)) {
$result = array();
foreach($datas as $data) {
+9
View File
@@ -249,6 +249,15 @@ $CFG->admin = 'admin';
// $CFG->session_memcached_acquire_lock_timeout = 120;
// $CFG->session_memcached_lock_expire = 7200; // Ignored if PECL memcached is below version 2.2.0
//
// Redis session handler (requires redis server and redis extension):
// $CFG->session_handler_class = '\core\session\redis';
// $CFG->session_redis_host = '127.0.0.1';
// $CFG->session_redis_port = 6379; // Optional.
// $CFG->session_redis_database = 0; // Optional, default is db 0.
// $CFG->session_redis_prefix = ''; // Optional, default is don't set one.
// $CFG->session_redis_acquire_lock_timeout = 120;
// $CFG->session_redis_lock_expire = 7200;
//
// Memcache session handler (requires memcached server and memcache extension):
// $CFG->session_handler_class = '\core\session\memcache';
// $CFG->session_memcache_save_path = '127.0.0.1:11211';
+4 -1
View File
@@ -96,6 +96,9 @@ abstract class format_base {
* @return string
*/
protected static final function get_format_or_default($format) {
global $CFG;
require_once($CFG->dirroot . '/course/lib.php');
if (array_key_exists($format, self::$classesforformat)) {
return self::$classesforformat[$format];
}
@@ -477,7 +480,7 @@ abstract class format_base {
*/
public function get_default_blocks() {
global $CFG;
if (!empty($CFG->defaultblocks)){
if (isset($CFG->defaultblocks)) {
return blocks_parse_default_blocks_list($CFG->defaultblocks);
}
$blocknames = array(
+11
View File
@@ -2660,6 +2660,11 @@ function update_course($data, $editoroptions = NULL) {
$data->timemodified = time();
// Prevent changes on front page course.
if ($data->id == SITEID) {
throw new moodle_exception('invalidcourse', 'error');
}
$oldcourse = course_get_format($data->id)->get_course();
$context = context_course::instance($oldcourse->id);
@@ -3599,6 +3604,12 @@ function duplicate_module($course, $cm) {
moveto_module($newcm, $section, $cm);
moveto_module($cm, $section, $newcm);
// Update calendar events with the duplicated module.
$refresheventsfunction = $newcm->modname . '_refresh_events';
if (function_exists($refresheventsfunction)) {
call_user_func($refresheventsfunction, $newcm->course);
}
// Trigger course module created event. We can trigger the event only if we know the newcmid.
$event = \core\event\course_module_created::create_from_cm($newcm);
$event->trigger();
+6
View File
@@ -188,6 +188,12 @@ switch($requestmethod) {
$grademodule->modname = $cm->modname;
grade_update_mod_grades($grademodule);
// Update calendar events with the new name.
$refresheventsfunction = $cm->modname . '_refresh_events';
if (function_exists($refresheventsfunction)) {
call_user_func($refresheventsfunction, $cm->course);
}
// We need to return strings after they've been through filters for multilang
$stringoptions = new stdClass;
$stringoptions->context = $coursecontext;
+12
View File
@@ -2735,4 +2735,16 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertNull($DB->get_field('course_modules', 'availability',
array('id' => $label->cmid)));
}
/**
* Test test_update_course_frontpage_category.
*/
public function test_update_course_frontpage_category() {
// Fetch front page course.
$course = get_course(SITEID);
// Test update information on front page course.
$course->category = 99;
$this->setExpectedException('moodle_exception');
update_course($course);
}
}
+1 -1
View File
@@ -7,7 +7,7 @@
require_once($CFG->libdir.'/completionlib.php');
$id = optional_param('id', 0, PARAM_INT);
$name = optional_param('name', '', PARAM_RAW);
$name = optional_param('name', '', PARAM_TEXT);
$edit = optional_param('edit', -1, PARAM_BOOL);
$hide = optional_param('hide', 0, PARAM_INT);
$show = optional_param('show', 0, PARAM_INT);
@@ -1,5 +1,6 @@
YUI.add('moodle-course-dragdrop', function (Y, NAME) {
/* eslint-disable no-unused-vars */
/**
* Drag and Drop for course sections and course modules.
*
@@ -1,5 +1,6 @@
YUI.add('moodle-course-dragdrop', function (Y, NAME) {
/* eslint-disable no-unused-vars */
/**
* Drag and Drop for course sections and course modules.
*
@@ -1,5 +1,7 @@
YUI.add('moodle-course-management', function (Y, NAME) {
/* global DragDrop, Category, Course */
/**
* Provides drop down menus for list of action links.
*
@@ -588,6 +590,8 @@ M.course.management.console = null;
M.course.management.init = function(config) {
M.course.management.console = new Console(config);
};
/* global Console */
/**
* Drag and Drop handler
*
@@ -1173,6 +1177,8 @@ Item.prototype = {
}
};
Y.extend(Item, Y.Base, Item.prototype);
/* global Item */
/**
* A managed category.
*
@@ -1616,6 +1622,8 @@ Category.prototype = {
}
};
Y.extend(Category, Item, Category.prototype);
/* global Item */
/**
* A managed course.
*
@@ -1,5 +1,7 @@
YUI.add('moodle-course-management', function (Y, NAME) {
/* global DragDrop, Category, Course */
/**
* Provides drop down menus for list of action links.
*
@@ -581,6 +583,8 @@ M.course.management.console = null;
M.course.management.init = function(config) {
M.course.management.console = new Console(config);
};
/* global Console */
/**
* Drag and Drop handler
*
@@ -1147,6 +1151,8 @@ Item.prototype = {
}
};
Y.extend(Item, Y.Base, Item.prototype);
/* global Item */
/**
* A managed category.
*
@@ -1575,6 +1581,8 @@ Category.prototype = {
}
};
Y.extend(Category, Item, Category.prototype);
/* global Item */
/**
* A managed course.
*
@@ -1,5 +1,6 @@
YUI.add('moodle-course-toolboxes', function (Y, NAME) {
/* eslint-disable no-unused-vars */
/**
* Resource and activity toolbox class.
*
@@ -201,6 +202,7 @@ Y.extend(TOOLBOX, Y.Base, {
}
}
);
/* global TOOLBOX, BODY, SELECTOR, INDENTLIMITS */
/**
* Resource and activity toolbox class.
@@ -931,6 +933,8 @@ M.course.init_resource_toolbox = function(config) {
M.course.resource_toolbox = new RESOURCETOOLBOX(config);
return M.course.resource_toolbox;
};
/* global SELECTOR, TOOLBOX */
/**
* Resource and activity toolbox class.
*
@@ -1,5 +1,6 @@
YUI.add('moodle-course-toolboxes', function (Y, NAME) {
/* eslint-disable no-unused-vars */
/**
* Resource and activity toolbox class.
*
@@ -201,6 +202,7 @@ Y.extend(TOOLBOX, Y.Base, {
}
}
);
/* global TOOLBOX, BODY, SELECTOR, INDENTLIMITS */
/**
* Resource and activity toolbox class.
@@ -931,6 +933,8 @@ M.course.init_resource_toolbox = function(config) {
M.course.resource_toolbox = new RESOURCETOOLBOX(config);
return M.course.resource_toolbox;
};
/* global SELECTOR, TOOLBOX */
/**
* Resource and activity toolbox class.
*
+1
View File
@@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
/**
* Drag and Drop for course sections and course modules.
*
+2
View File
@@ -1,3 +1,5 @@
/* global Item */
/**
* A managed category.
*
+2
View File
@@ -1,3 +1,5 @@
/* global DragDrop, Category, Course */
/**
* Provides drop down menus for list of action links.
*
+2
View File
@@ -1,3 +1,5 @@
/* global Item */
/**
* A managed course.
*
+2
View File
@@ -1,3 +1,5 @@
/* global Console */
/**
* Drag and Drop handler
*
+2
View File
@@ -1,3 +1,5 @@
/* global TOOLBOX, BODY, SELECTOR, INDENTLIMITS */
/**
* Resource and activity toolbox class.
*
+2
View File
@@ -1,3 +1,5 @@
/* global SELECTOR, TOOLBOX */
/**
* Resource and activity toolbox class.
*
+1 -1
View File
@@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
/**
* Resource and activity toolbox class.
*
@@ -199,4 +200,3 @@ Y.extend(TOOLBOX, Y.Base, {
}
}
);

Some files were not shown because too many files have changed in this diff Show More