Compare commits

...

2329 Commits

Author SHA1 Message Date
Ilya Tregubov 8c989335be Moodle release 4.2.1 2023-06-10 14:07:52 +08:00
Ilya Tregubov d4937c4527 weekly release 4.2+ 2023-06-09 13:14:22 +08:00
Sara Arjona 62e7dc94d9 Merge branch 'MDL-78415-402-enfix' of https://github.com/vmdef/moodle into MOODLE_402_STABLE 2023-06-08 20:33:07 +02:00
Víctor Déniz cf40395830 MDL-78415 lang: Fix typo in Behat tests 2023-06-08 18:48:39 +01:00
Víctor Déniz ab62e5f23f MDL-78415 lang: Fix Behat tests regressions after merging en_fix strings 2023-06-08 11:52:38 +01:00
Víctor Déniz a29056941b MDL-78415 lang: Add parameter to reopencolumn string 2023-06-08 11:51:59 +01:00
Helen Foster 78db6582ba MDL-78415 lang: Import fixed English strings (en_fix) 2023-06-08 11:50:02 +01:00
Sara Arjona b1ccbfc24d Merge branch 'MDL-77946-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 06:56:51 +02:00
Sara Arjona 8c9545ca78 Merge branch 'MDL-78308-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 06:48:35 +02:00
Andrew Nicols 5b48a61484 Merge branch 'MDL-75696_402_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_402_STABLE 2023-06-08 12:31:03 +08:00
Andrew Nicols ef3eb09347 Merge branch 'MDL-78364-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 12:18:50 +08:00
Andrew Nicols abff2a6570 Merge branch 'MDL-78008_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-06-08 12:10:28 +08:00
Andrew Nicols 15afb64771 Merge branch 'MDL-77933-402' of https://github.com/snake/moodle into MOODLE_402_STABLE 2023-06-08 12:03:17 +08:00
Andrew Nicols c8631653cd MDL-76838 core: Add unit test for invalid unicode sequences 2023-06-08 11:59:14 +08:00
Andrew Nicols 30add0c159 Merge branch 'MDL-76838-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 11:54:25 +08:00
Cameron Ball 2fbb766149 MDL-75898 assignfeedback_editpdf: Improve page count mismatch logic
MDL-45580 introduced the readonlypages filearea, and when loading
page images for an attempt, the code would check if the pages existed
, creating them if not. The code inside this block also contained
a guard clause for the case where no readonly pages existed - which
is a situation that should not happen. Whenever readonly pages are
requested, they should exist.

MDL-66626 introduced a situation where page counts not matching would
also retrigger page generation. However this led to a situation where
the guard clause could be entered when requesting readonly pages.

This patch refactors the guard clause, and improves the logic to
regenerate pages.
2023-06-08 11:44:19 +08:00
Cameron Ball 3fa41951f3 MDL-75898 assignfeedback_editpdf: Don't poll readonly pages
When requesting the readonly version of pages (which contain
teacher annotations), they should always be available - the
PHP side even throws an exception when they're not. This
means we don't need to worry about polling document converters
from the JS side and can just return the pages immediately.
2023-06-08 11:44:19 +08:00
Cameron Ball 3d02f36f87 MDL-75898 assignfeedback_editpdf: Add randomness to PDF annotations
The behat step "I draw on the pdf" creates the exact same line every
time it is called. This can cause issues in a situation like the following:

- Student uploads PDF
- Teacher annotates page 1
- Student edits submission, adding another PDF
- Teacher annotates page 1 again
- When the student looks at their annotated PDF it appears the same as
  before they added the second PDF (i.e., they don't see extra pages for
  the second PDF)

Exactly why this happens isn't clear, and in practice this probably never
happens because the chances of drawing the exact same line twice are almost
0. However, when testing the functionality added in MDL-45580 it was causing
issues.
2023-06-08 11:44:19 +08:00
Andrew Nicols dcd20bec34 Merge branch 'MDL-78026-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 11:36:40 +08:00
Andrew Nicols fec48e90ac Merge branch 'MDL-77264-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-08 11:34:06 +08:00
Andrew Nicols 1a469cda51 Merge branch 'MDL-76821-402' of https://github.com/snake/moodle into MOODLE_402_STABLE 2023-06-08 11:29:11 +08:00
Jake Dallimore f98b725610 MDL-77933 enrol_lti: return site name and logo during registration
Instead of the Moodle icon and the 'moodle' lang string, return the
site fullname and compact logo during dynamic registration.
2023-06-08 11:28:38 +08:00
Andrew Nicols cc9f2527a8 Merge branch 'MDL-77799-m402' of https://github.com/sammarshallou/moodle into MOODLE_402_STABLE 2023-06-08 11:21:14 +08:00
Andrew Nicols 8e5f9ca9d4 Merge branch 'MDL-78408-402' of https://github.com/snake/moodle into MOODLE_402_STABLE 2023-06-08 11:05:20 +08:00
Jun Pataleta d247ea08e9 Merge branch 'MDL-78036_402' of https://github.com/stronk7/moodle into MOODLE_402_STABLE 2023-06-08 11:03:33 +08:00
Andrew Nicols eab902354f Merge branch 'wip_MDL-78400_m42' of https://github.com/gjb2048/moodle into MOODLE_402_STABLE 2023-06-08 10:51:34 +08:00
Andrew Nicols d3e4957556 Merge branch 'MDL-76406-402' of https://github.com/safatshahin/moodle into MOODLE_402_STABLE 2023-06-08 10:37:53 +08:00
Jun Pataleta 40b68fd88f Merge branch 'MDL-76842-402' of https://github.com/snake/moodle into MOODLE_402_STABLE 2023-06-08 10:34:37 +08:00
Jun Pataleta c180b1babd Merge branch 'MDL-78229-402' of https://github.com/lucaboesch/moodle into MOODLE_402_STABLE 2023-06-08 10:30:34 +08:00
Jun Pataleta a1e281a31d Merge branch 'MDL-78431-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-06-08 10:28:25 +08:00
Jake Dallimore ab12596a7b MDL-76842 enrol_lti: fix user record updates in user_repository
Only call user_update_user when the relevant user data has changed,
preventing unnecessary user_updated events. This also removes the
line setting timemodified on the user since user_update_user already
handles this.
2023-06-08 10:28:24 +08:00
Jake Dallimore fd5585777f MDL-76842 enrol_lti: test confirming the erroneous user_updated events
This test will fail until the fix - only updating users when data has
changed - is put in place in the following commit.
2023-06-08 09:37:45 +08:00
Jake Dallimore 5132a27822 MDL-76842 auth_lti: don't update the user unless data has changed
When receiving data from the LTI launch, or service call, only update
the user record when we know something has changed. This prevents the
creation of many \core\event\user_updated events.
2023-06-08 09:37:44 +08:00
Stevani Andolo 9f6fbc11dd MDL-78215 core: Added support unit test 2023-06-08 09:36:40 +08:00
Stevani Andolo a801a741b9 MDL-78215 core: support checking if 0.0.0.0 is in subnet 2023-06-08 09:36:40 +08:00
Jake Dallimore 685be3d41b MDL-76842 auth_lti: don't update the user after membership creation
This isn't required and generates excess events. The only thing update
does, other than update the user fields, is to update the picture, but
in this case, that's unset in membership-based auths anyway, so it's
entirely safe to remove this.
2023-06-08 09:36:17 +08:00
Jake Dallimore 0e504f73ee MDL-76842 auth_lti: test confirming the erroneous user_updated events
This test will fail until the fix - only updating users when data has
changed - is put in place in the following commit.
2023-06-08 09:36:16 +08:00
Jun Pataleta 7dfcc7e3f5 Merge branch 'MDL-78378-402' of https://github.com/sarjona/moodle into MOODLE_402_STABLE 2023-06-07 23:25:42 +08:00
Jun Pataleta 35500db40c Merge branch 'MDL-76745_402_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_402_STABLE 2023-06-07 22:54:16 +08:00
Andrew Nicols cfb5b76ba7 MDL-78431 core: Abort after config for source maps 2023-06-07 21:07:43 +08:00
Sara Arjona ff68353e39 Merge branch 'MDL-78322-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-07 12:43:03 +02:00
Sara Arjona 0f410c087a Merge branch 'MDL-78352-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-07 12:41:11 +02:00
Sara Arjona e160cdd8a7 Merge branch 'MDL-78047-402' of https://github.com/stevandoMoodle/moodle into MOODLE_402_STABLE 2023-06-07 18:14:20 +08:00
Sara Arjona d25ad8aaf9 Merge branch 'MDL-78010-402' of https://github.com/ferranrecio/moodle into MOODLE_402_STABLE 2023-06-07 18:14:20 +08:00
Sara Arjona c938c41de8 Merge branch 'MDL-78143-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-06-07 18:14:19 +08:00
Sara Arjona 04996f2cf8 Merge branch 'MDL-78147-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-06-07 18:14:19 +08:00
sam marshall 5481c31fe6 MDL-77799 webservice_rest: unhandled exception should go in server log 2023-06-07 10:02:05 +01:00
Jake Dallimore 79a9167a1e MDL-78408 core: fix restoration of anchor to wantsurl during login 2023-06-07 14:28:57 +08:00
Stevani Andolo 4d035d0f80 MDL-78047 core_courseformat: Wrapping added to text and media activity 2023-06-07 12:58:52 +08:00
Paul Holden cd885856f3 MDL-77193 mnet: correct sorting of access control table. 2023-06-07 09:53:31 +08:00
Meirza 5f67d77aae MDL-78147 h5p: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-06-07 05:17:33 +07:00
Ferran Recio d59a10108c MDL-78010 mod_label: improve upgrade performance 2023-06-06 21:33:16 +02:00
Meirza b4cf5c50bf MDL-78143 lib: Added class properties in html purifier
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-06-06 21:48:13 +07:00
Eloy Lafuente (stronk7) 71440dc236 MDL-78036 behat: Move all links from old docs to new counterparts 2023-06-06 12:38:49 +02:00
Petr Skoda 75264720ac MDL-76683 core_group: fix template 2023-06-06 09:33:15 +00:00
Hiroto Kagotani 735c2c6b47 MDL-76936 course: purge course cache on resetting start date 2023-06-06 11:22:39 +02:00
Paul Holden 319d3954f8 MDL-78364 reportbuilder: earlier calculation of schedule recipients. 2023-06-05 16:22:30 +01:00
Gareth Barnard 0fc6e59121 MDL-78400 JavaScript: Building JS puts build files in src dir on Win. 2023-06-05 14:54:24 +01:00
Luca Bösch ace6e8db3d MDL-78229 quiz: quiz editing page less narrow.
This is a backport of MDL-77872.
2023-06-02 08:34:08 +02:00
Sara Arjona 2970f0f433 MDL-78378 survey: Display default introduction when description is empty
This is a regression when the activity pages were redessigned in Moodle
4.0. The default introduction should be displayed when the activity
description is empty.
2023-06-02 08:19:53 +02:00
Safat 4899d8c11a MDL-76406 core: Add environment check for versions not supporting 8.2 2023-06-02 12:05:24 +10:00
Ilya Tregubov 20302d4f86 weekly release 4.2+ 2023-06-02 09:55:35 +08:00
Ilya Tregubov d1053fe035 Merge branch 'install_402_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_402_STABLE 2023-06-02 09:55:33 +08:00
Mark Johnson 5d361ee332 MDL-76745 cache: Implement cache_loader_with_locking in cache_disabled
If a plugin attempts to do something that would lock coursemodinfo cache
during install (such as creating a course module), this currently fails
as check_lock_state is not implemented in cache_disabled. Adding the
cache_loader_with_locking interface ensures that all lock methods are
implemented.
2023-06-01 15:04:39 +01:00
Brendan Heywood a43b2b2998 MDL-77749 admin: Fix code error with unset config duration 2023-06-01 13:32:37 +08:00
Jun Pataleta cf46e93304 Merge branch 'MDL-78092-m402' of https://github.com/sammarshallou/moodle into MOODLE_402_STABLE 2023-06-01 11:36:32 +08:00
Andrew Nicols bb7b0f996d Merge branch 'MDL-78383_m402' of https://github.com/jrchamp/moodle into MOODLE_402_STABLE 2023-06-01 11:12:45 +08:00
Andrew Nicols 9c5e63cf17 Merge branch 'MDL-78146-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-06-01 11:07:03 +08:00
Andrew Nicols 5d89ce0058 Merge branch 'MDL-78327_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-06-01 10:52:31 +08:00
Ilya Tregubov 6143ad4b1b Merge branch 'MDL-78196-402' of https://github.com/jleyva/moodle into MOODLE_402_STABLE 2023-06-01 10:40:17 +08:00
Andrew Nicols d54edef0f7 Merge branch 'MDL-78142-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-06-01 09:54:24 +08:00
Ilya Tregubov 02d2e80bae Merge branch 'MDL-77259-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-06-01 09:29:39 +08:00
Ilya Tregubov 5cf5134a12 Merge branch 'MDL-75961-402' of https://github.com/lameze/moodle into MOODLE_402_STABLE 2023-06-01 09:08:02 +08:00
AMOS bot 5112c89929 Automatically generated installer lang files 2023-06-01 00:11:06 +00:00
Juan Leyva fab3b2ccbc MDL-78196 user: Fix files used space check 2023-05-31 17:15:18 +02:00
Sara Arjona 56f75d7aea Merge branch 'MDL-76693-402' of https://github.com/roland04/moodle into MOODLE_402_STABLE 2023-05-31 17:08:55 +02:00
Simey Lameze 2f10bf1a1f MDL-77547 behat: run recalculate task before checking values 2023-05-31 15:04:54 +02:00
Tim Hunt 0384f8dfa0 MDL-78327 question stats: store same timestamp for all question stats 2023-05-31 12:02:23 +01:00
Sara Arjona e05576d74c Merge branch 'MDL-77547-402' of https://github.com/andelacruz/moodle into MOODLE_402_STABLE 2023-05-31 12:51:25 +02:00
Sara Arjona 01b577ee65 Merge branch 'MDL-77907-402' of https://github.com/andelacruz/moodle into MOODLE_402_STABLE 2023-05-31 12:18:07 +02:00
Sara Arjona 0f5a1a61f7 Merge branch 'MDL-78145-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-05-31 12:09:24 +02:00
Sara Arjona b4479d7981 Merge branch 'MDL-78148-402' of https://github.com/ferranrecio/moodle into MOODLE_402_STABLE 2023-05-31 11:42:12 +02:00
Sara Arjona 2a2badacb2 Merge branch 'MDL-73648-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-31 11:38:13 +02:00
Jonathan Champ eb0585ea72 MDL-78383 cache: Remove unused class property configlockmappings 2023-05-30 19:45:28 -04:00
Ilya Tregubov 7faf41dce5 Merge branch 'MDL-73138-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-30 12:54:09 +08:00
Ilya Tregubov 6aa360ae83 Merge branch 'MDL-77723-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-30 12:44:28 +08:00
AMOS bot 804e8b62da Automatically generated installer lang files 2023-05-30 00:10:40 +00:00
Jun Pataleta 1092a998ae Merge branch 'MDL-78314-402' of https://github.com/lucaboesch/moodle into MOODLE_402_STABLE 2023-05-29 17:35:15 +08:00
Mikel Martín 027e3c6660 MDL-76693 core_course: Fix activity chooser summary overlap
In activity chooser modal, there is an overlap issue in the information "sub-page".
Changing some classes in the layout solves the problem.
2023-05-29 09:38:32 +02:00
Ferran Recio 2b407d891f MDL-78148 core_courseformat: reduce the use of uniqid in templates 2023-05-29 08:40:20 +02:00
Meirza 1b284001ac MDL-78146 lib: Added missing class properties in phpmailer
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-27 11:27:14 +07:00
Meirza b3350a0ea7 MDL-78145 lib: Added missing class properties in pear
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-27 11:11:29 +07:00
Meirza 0ffed15ee4 MDL-78142 lib: Added class properties that are not declared in bennu
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-27 09:50:11 +07:00
Eloy Lafuente (stronk7) d20cf16533 MDL-78036 behat: Fix php81 deprecation warning 2023-05-26 18:04:18 +02:00
Luca Bösch 3e13847324 MDL-78314 quiz: style button fieldset in "Manually grade question". 2023-05-26 15:10:33 +02:00
Paul Holden 24f646038c MDL-78352 webservice: use default user context page heading. 2023-05-26 12:27:40 +01:00
Paul Holden 928760f865 MDL-73648 badges: add Behat generator class for creating badges. 2023-05-26 12:19:20 +01:00
Paul Holden 9a3f097da5 MDL-73138 group: remove double encoding of group/role names. 2023-05-26 10:25:42 +01:00
Paul Holden 1198d57f71 MDL-73138 user: avoid double encoding participant filter values. 2023-05-26 10:25:42 +01:00
Sara Arjona 6b8884e13b weekly release 4.2+ 2023-05-26 09:28:41 +02:00
Sara Arjona 7edbca66f9 Merge branch 'install_402_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_402_STABLE 2023-05-26 09:28:36 +02:00
Jun Pataleta e0c8854480 Merge branch 'MDL-78346-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-05-25 16:22:41 +08:00
Andrew Nicols 7d5b30290f MDL-78346 tool_langimport: Print any notifications before redirect 2023-05-25 14:54:58 +08:00
Jun Pataleta 3e2bf77656 Merge branch 'MDL-78339-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-25 12:01:10 +08:00
Jun Pataleta 15b0cd25e6 Merge branch 'MDL-76065-402' of https://github.com/lameze/moodle into MOODLE_402_STABLE 2023-05-25 11:57:05 +08:00
Jun Pataleta e99fcecdf9 Merge branch 'MDL-78320-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-25 11:48:47 +08:00
Jun Pataleta 5feb510035 Merge branch 'MDL-78346-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-05-25 11:43:43 +08:00
Andrew Nicols cae92e5a92 MDL-78346 tool_langimport: Redirect after action to prevent resubmission 2023-05-25 11:14:15 +08:00
Andrew Nicols 1342f28224 MDL-78346 tool_langimport: Prevent uninstallation of invalid targets 2023-05-25 11:14:14 +08:00
Andrew Nicols b0b214bbf2 Merge branch 'MDL-77341-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-05-25 10:46:32 +08:00
Andrew Nicols 1ff32127d4 Merge branch 'MDL-78307-402' of https://github.com/dpalou/moodle into MOODLE_402_STABLE 2023-05-25 10:42:57 +08:00
Andrew Nicols a443a29b79 Merge branch 'MDL-77995-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-25 09:50:34 +08:00
Paul Holden f92c748a2d MDL-78320 quiz_overview: format group names in overview report. 2023-05-24 16:19:32 +01:00
Andrew Nicols af0f37405f Merge branch 'MDL-77983-402' of https://github.com/rjnl/moodle into MOODLE_402_STABLE 2023-05-24 21:15:03 +08:00
Dani Palou fb71a7a8c7 MDL-78307 quiz: Fix URL passed to secure_window.init_close_button 2023-05-24 13:10:45 +02:00
Dani Palou b10afcdd4c MDL-78307 quiz: Fix contexturl passed to attempt_overdue message 2023-05-24 13:10:45 +02:00
Paul Holden 93c35a89bb MDL-78339 webservice: correctly namespace external API. 2023-05-24 09:38:08 +01:00
Jun Pataleta 43fdf37a96 Merge branch 'MDL-78005-402' of https://github.com/davewoloszyn/moodle into MOODLE_402_STABLE 2023-05-24 12:06:45 +08:00
Simey Lameze b490a0ae08 MDL-75961 behat: review and enhance mod_imscp tests
This commit makes the following improvements to mod_imscp tests:
* Removes unnecessary @javascript and @_file_upload tags from non-JS tests.
* Removes user/enrol data generation from tests that can be performed as admin.
* Removes "I log out" and other unnecessary steps.
2023-05-24 10:40:44 +08:00
Angelia Dela Cruz 80410a354b MDL-75961 behat: IMSCP behat generators use UI
Replace steps that manually add IMSCP instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2023-05-24 10:40:44 +08:00
Sara Arjona b1b0c2d59b Merge branch 'MDL-78176_402' of https://github.com/AnupamaSarjoshi/moodle into MOODLE_402_STABLE 2023-05-23 17:45:52 +02:00
Sara Arjona aa7aec1088 Merge branch 'MDL-78242-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-23 17:36:54 +02:00
Jun Pataleta 7bae6c8ca6 Merge branch 'MDL-76688/402' of https://github.com/skodak/moodle into MOODLE_402_STABLE 2023-05-23 15:22:14 +08:00
Angelia Dela Cruz 7a5806d3cb MDL-77547 Behat: Coverage to check for bad multichoice questions 2023-05-23 15:16:04 +08:00
Simey Lameze 279cc50e5c MDL-76065 behat: Review and enhance mod_lti Behat tests
In this commit, the following improvements were made to the mod_lti Behat tests:

* Replaced manual steps with data generators to set completion.
* Eliminated unnecessary user and course enrolments data generation as some tests can be performed as an admin.
* Removed the @javascript tag from non-JS tests.
* Updated the LTI data generator to generate an internal Moodle URL in the toolurl field, enabling the use of XML files.
2023-05-23 12:13:53 +08:00
Angelia Dela Cruz dc4ff6a2f5 MDL-76065 behat: LTI behat generators use UI
Replace steps that manually add LTI instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2023-05-23 12:13:53 +08:00
Andrew Nicols fb343534d0 Merge branch 'MDL-78170-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-23 10:28:05 +08:00
Andrew Nicols b4935649b3 Merge branch 'MDL-78087-402' of https://github.com/sarjona/moodle into MOODLE_402_STABLE 2023-05-23 10:26:39 +08:00
AMOS bot 0d426e571a Automatically generated installer lang files 2023-05-23 00:10:30 +00:00
Paul Holden b938b53096 MDL-76838 backup: remove invalid utf8 code sequences writing XML.
The surrogate blocks FFFE and FFFF are non-characters, specifically
disallowed in the character range for XML documents.
2023-05-22 21:04:07 +01:00
Paul Holden 525b69dc69 MDL-78322 tool_cohortroles: don't assign roles to deleted users. 2023-05-22 20:14:34 +01:00
Tim Hunt 5630f86d81 MDL-78008 qtype_multianswer: random guess score with missing subqs
Sometimes, due to other bugs, subquestions can get lost, so the code
needs to be robust to this.
2023-05-22 17:01:59 +01:00
Sara Arjona 30ac87781a Merge branch 'MDL-78211-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-22 17:41:42 +02:00
Sara Arjona 2b9a9286d0 Merge branch 'MDL-78226-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-22 17:29:21 +02:00
Sara Arjona 2e6d8b72b1 Merge branch 'MDL-78225-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-22 12:04:13 +02:00
sam marshall 2724eb6041 MDL-78092 Cache: Modinfo locking with Redis store does not work
The feature added in 4.1 to lock the modinfo cache does not work when
using Redis, because:

* The API to acquire a cache lock is confusing, and the code did not
  check that it successfully acquired a lock before going on to build
  the cache anyway.

* Unlike the other types of cache lock, the Redis store did not retry
  the lock for a timeout period before giving up and failing.

This change fixes both points.
2023-05-22 10:44:15 +01:00
Jun Pataleta df8413ade0 Merge branch 'MDL-78157-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-05-22 15:29:36 +08:00
Andrew Nicols 414f0df046 MDL-78157 js: Be more careful about inserting missing module names
It is perfectly legitimate to create and/or use a method named `define`
in JS outside of RequireJS.

Unfortunately our requirejs.php wrapper is dumb and does not understand
this.

In the long term we need to stop doing this at all. We really should be
able to already, but every time I try to something prevents it.

In the interim, this change adds a secondary check to see if there is an
existing define which _does_ have the right name in it already.
2023-05-22 14:40:41 +08:00
Jun Pataleta 29a7e00f9c Merge branch 'MDL-78323-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-05-22 14:29:10 +08:00
Andrew Nicols 81b9a51fb7 MDL-78323 gradereport_grader: Fix jsdoc syntax 2023-05-22 09:23:47 +08:00
Meirza 03c461ab87 MDL-77341 mnet: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-20 21:38:35 +07:00
Anupama Sarjoshi c2fbb10a52 MDL-78176 Question: Fix D&D onto image and D&D markers theme issue 2023-05-19 16:31:44 +01:00
Jun Pataleta 4781b41631 weekly release 4.2+ 2023-05-19 21:13:51 +08:00
Jun Pataleta caf4da762c Merge branch 'install_402_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_402_STABLE 2023-05-19 21:13:48 +08:00
Andrew Nicols 0ab5bf01f0 MDL-77733 behat: Remove extraneous no-axe option
There is no need for no-axe if we make axe a boolean value. We already
have automatic support for negated boolean flags.
2023-05-19 11:27:57 +08:00
Mark Johnson 078782e656 MDL-75696 quiz: Fix restoring pre-4.0 quizzes with random questions
Restoring multiple quizzes from a pre-4.0 backup was broken when
the quizzes shared a random question. This is because after the
first quiz created a set reference in place of the random question,
it deleted the question record so it was not there for the second
quiz to use. This change tracks the IDs of random questions so
they can be deleted at the end.
2023-05-18 15:55:39 +01:00
Mark Johnson 2b6456c1d0 MDL-75696 quiz: Set default value for includingsubcategories on restore 2023-05-18 15:55:39 +01:00
Mark Johnson a37ce627a8 MDL-75696 backup: Fix backup version checks
Several version checks were incorrectly using
restore_controller::info::moodle_release instead of moodle_version as a
version number. This replaces all of those checks with a common pair of
methods to make the checks clearer and more maintainable.
2023-05-18 15:55:38 +01:00
Paul Holden 26b885edb6 MDL-78308 output: better parsing of custom menu item configuration.
Previously certain values would cause deprecation notices in PHP8.1.
2023-05-18 10:19:20 +01:00
Jun Pataleta b514f0bb1d Merge branch 'MDL-78116-402' of https://github.com/andrewnicols/moodle into MOODLE_402_STABLE 2023-05-18 12:11:39 +08:00
Andrew Nicols 12dc12c954 Merge branch 'MDL-77451-402' of https://github.com/rezaies/moodle into MOODLE_402_STABLE 2023-05-18 11:59:41 +08:00
Jun Pataleta ec7b3cab86 Merge branch 'MDL-78135-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-18 11:54:58 +08:00
Andrew Nicols 6808c8f3b2 Merge branch 'MDL-78260_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-05-18 11:51:32 +08:00
Andrew Nicols 109a0ffeb9 Merge branch 'MDL-78151-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-18 11:48:26 +08:00
Simey Lameze 4a04cda71b MDL-77733 behat: enable Axe accessibility tests by default 2023-05-18 11:43:57 +08:00
David Woloszyn a0920d8b8d MDL-78005 editor_tiny: Declared vars to supress error logging 2023-05-18 13:02:55 +10:00
Jun Pataleta 11bf54289f Merge branch 'MOODLE_402_STABLE_MDL-78048' of https://github.com/mattporritt/moodle into MOODLE_402_STABLE 2023-05-18 10:14:47 +08:00
Tim Hunt 666708b561 MDL-78260 quiz stats: fix View details for random questions 2023-05-17 09:10:20 +01:00
Rajneel Totaram a1162e3943 MDL-77983 core_user: Avoid passing nulls to base64_decode 2023-05-17 19:37:15 +12:00
Ilya Tregubov 9de9651809 Merge branch 'MDL-78152-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-17 15:07:17 +08:00
Sara Arjona dcb3ce31ce Merge branch 'MDL-77350-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE 2023-05-17 08:26:39 +02:00
Meirza 8b641a1b0d MDL-77350 tag: Added class properties that are not declared 2023-05-17 09:00:09 +07:00
Meirza 8fa53a336e MDL-77350 competency: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 5a22258f42 MDL-77350 favourites: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.

// Removed test_add_malformed_favourite()
PHPUnit version >= 9.5 no longer converts PHP deprecations to exceptions by default.
To comply with PHP 8.2, which will deprecate the dynamic properties,
we need to remove test_add_malformed_favourite()
because the test will raise a warning for dynamic property deprecations.
2023-05-17 09:00:09 +07:00
Meirza 92cba2c5ba MDL-77350 auth: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 7d8a40fe3e MDL-77350 availability: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 2de2d6bc30 MDL-77350 badges: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza beb55edffc MDL-77350 blocks: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza ae8466162d MDL-77350 blog: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza b5f98e022d MDL-77350 cache: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza b9d21ee2ad MDL-77350 calendar: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 04fb9beb20 MDL-77350 comment: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 3be559b763 MDL-77350 completion: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 88a1d4d4c2 MDL-77350 course: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza e0045688b3 MDL-77350 enrol: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza c645df564a MDL-77350 filter: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 8bac8a2da7 MDL-77350 media: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 2e339446d8 MDL-77350 message: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:09 +07:00
Meirza 1c9379ab09 MDL-77350 mod_h5pactivity: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
Meirza 24ad6848aa MDL-77350 portfolio: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
Meirza da43ea4ef7 MDL-77350 rating: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
Meirza f49f24c516 MDL-77350 report: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
Meirza 473cfc369d MDL-77350 search: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
Meirza 0ba9466281 MDL-77350 webservice: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-05-17 09:00:08 +07:00
AMOS bot 9e6f6c0e7e Automatically generated installer lang files 2023-05-17 00:11:02 +00:00
Matt Porritt b87a75110b MDL-78048 Site Registration: Course Dates
Course date registration data reports correctly.

MDL-77306 added a count of how many courses there are
without start and end dates. However, all courses have
a start date, it is only the end date that is optional.
This patch fixes the data collection and makes the lang
string describing it clearer.
2023-05-17 09:03:20 +10:00
Jun Pataleta 52bcdf9e06 Merge branch 'MDL-77439-402' of https://github.com/junpataleta/moodle into MOODLE_402_STABLE 2023-05-16 20:38:50 +08:00
Peter Mayer f113d4c116 MDL-77439 lib_filebrowser: Splitup query to speedup get_courses 2023-05-16 20:37:47 +08:00
Paul Holden 16bac432fd MDL-78026 group: format retrieved group names from external methods. 2023-05-16 10:10:01 +01:00
Paul Holden 4e28613a16 MDL-77264 grade: define fallback name of abstract export event. 2023-05-16 09:54:34 +01:00
Paul Holden 1df40c823e MDL-77259 tool_monitor: use core component API for event list.
The previous method of hardcoded filepaths, specifically for events
belonging to core, meant that any events belongs to core subsystems
were omitted (core_customfield, core_h5p, core_payment, etc).
2023-05-16 09:50:17 +01:00
Angelia Dela Cruz 5dfec00bb1 MDL-77907 Behat: Coverage for duplicating competency framework 2023-05-16 15:45:05 +08:00
Jake Dallimore c00c6dd4cf Merge branch 'MDL-77930-402' of https://github.com/rjnl/moodle into MOODLE_402_STABLE 2023-05-16 10:49:46 +08:00
Jake Dallimore 0f687a9028 Merge branch 'MDL-78120-402' of https://github.com/lucaboesch/moodle into MOODLE_402_STABLE 2023-05-16 10:44:49 +08:00
Jun Pataleta 1d2b0ade40 Merge branch 'MDL-75576_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-05-16 09:59:11 +08:00
Ilya Tregubov a5f2c1d591 Merge branch 'MDL-77840-402' of https://github.com/davewoloszyn/moodle into MOODLE_402_STABLE 2023-05-16 09:48:13 +08:00
Andrew Nicols 5e59ad2b6e Merge branch 'MDL-77432-402' of https://github.com/lucaboesch/moodle into MOODLE_402_STABLE 2023-05-15 22:12:31 +08:00
Andrew Nicols 441003231f Merge branch 'MDL-78149-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-15 22:06:20 +08:00
Andrew Nicols 54c8336373 Merge branch 'MDL-78140-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-15 22:03:44 +08:00
Paul Holden e3ac233307 MDL-78242 roles: consistently check course contact config. 2023-05-15 13:04:39 +01:00
Tim Hunt 4d263b0505 MDL-75576 quiz/question statistics: don't expire by time
Previously, a set of calculated quiz statistics would only 'last' for
15 minutes. Then they would be considered invalid and not used.

Now, computed statistics are kept indefinitely. Instead, when a new
batch of values are computed for a particular set of settings, older numbers
for the same settings are deleted first. Therefore,
question_stats_cleanup_task is no more.
2023-05-15 10:03:27 +01:00
Tim Hunt 25953f9c7f MDL-75576 quiz statistics: don't time-limit the use of cached values
This should have been done as part of  MDL-74762, but was missed.
2023-05-15 10:03:26 +01:00
Tim Hunt b112cee58c MDL-75576 quiz statistics: don't compute when a user views the qbank
Previously, when users viewed the question bank, if the quiz statistics
had not already been calculated, we would try to compute them there an then.
This could be very, very slow, leading to session lock problems.

Now, we never try to compute the statistics on the fly. Instead, we rely
on the existing \quiz_statistics\task\recalculate scheduled task to do it.
2023-05-15 10:03:26 +01:00
Tim Hunt bc7dacecb6 MDL-75576 question bank: bulk-load statistics for all questions at once
There is a new method on the column class, for the column to declare any
statistics it requires. The question then efficiently loads all those
statistics in one go, and makes them available as the columns are
rendererd, or do any subsequent processing.
2023-05-15 10:03:26 +01:00
Tim Hunt d1fcfd1de2 MDL-75576 qbank_statistics: remove copy-pasted PHPdoc comments
These methods are already correctly documented on the base class.
2023-05-15 10:03:25 +01:00
Luca Bösch 32bc50a135 MDL-78120 login: handle empty wantsurl on login with alternateloginurl. 2023-05-15 10:20:24 +02:00
Paul Holden 02e893a575 MDL-77995 javascript: more precise path matching building JS. 2023-05-15 09:05:44 +01:00
Paul Holden 59c75c928d MDL-77723 user: ensure identity refers to a valid custom profile field. 2023-05-15 09:03:34 +01:00
Andrew Nicols c2a74815c0 Merge branch 'MDL-78156_402' of https://github.com/stronk7/moodle into MOODLE_402_STABLE 2023-05-15 12:43:38 +08:00
Jun Pataleta 9ac38f5db6 Merge branch 'MDL-76903-402' of https://github.com/laurentdavid/moodle into MOODLE_402_STABLE 2023-05-15 12:06:09 +08:00
Andrew Nicols 04b35cb3db Merge branch 'MDL-78125-402' of https://github.com/junpataleta/moodle into MOODLE_402_STABLE 2023-05-15 11:57:59 +08:00
Jun Pataleta c6cc0449ed MDL-78125 qtype_multianswer: Convert popover trigger to link
According to Boostrap Popovers documentation for popovers triggered
on focus:
"For proper cross-browser and cross-platform behavior, you must use the
<a> tag, not the <button> tag, and you also must include a tabindex
attribute."
2023-05-12 22:47:18 +08:00
Luca Bösch 30f1f0778f MDL-77432 mod_assign: Confirm submission page standard and not incourse 2023-05-12 09:20:14 +02:00
Ilya Tregubov f9edf5c1be weekly release 4.2+ 2023-05-12 08:56:43 +08:00
Ilya Tregubov c4f7a44824 Merge branch 'install_402_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_402_STABLE 2023-05-12 08:56:41 +08:00
Paul Holden 26dbb8466a MDL-78226 contentbank: verify presence of bank heading element. 2023-05-11 23:16:29 +01:00
Paul Holden 2fb84af337 MDL-78225 output: add sesskey for post requests only in renderables. 2023-05-11 22:48:48 +01:00
Laurent David 717c74a448 MDL-76903 mod_book: Fix activity completion
* Check only visibles pages to set completion status.
* Make sure we have consistent completion value in API and on the view page.
2023-05-11 12:09:26 +02:00
Paul Holden 4a2e621012 MDL-78140 analytics: improve context restrictions manager test.
This test apparently fails sporadically on Oracle, without obvious
causes. The failure however was hard to interpret, and the test
itself made a lot of assumptions about the system re. naming of
categories/courses. This could be prone to errors, so improve that.
2023-05-11 09:37:46 +01:00
Sara Arjona 732dc4f334 MDL-78087 h5p: Fix TimeLine display bug
When the H5P third-party library was upgraded to moodle-1.23, the calls to
libraryToString(xxx, true) where replaced with libraryToFolderName().
We missed this, which was doing the H5P Timeline activities weren't
displayed properly.

Thanks Joseph for raising this and preparing a patch! Well done!

Co-authored: Joseph Rézeau
2023-05-11 10:22:48 +02:00
Paul Holden c348119685 MDL-77946 access: fix category sort order of capability contexts. 2023-05-11 08:33:27 +01:00
Jun Pataleta ced8835b5f Merge branch 'MDL-76344-402-fix' of https://github.com/stevandoMoodle/moodle into MOODLE_402_STABLE 2023-05-11 14:35:13 +08:00
Stevani Andolo a5cf13cd90 MDL-76344 course: Fixed course image 'non image file' layout 2023-05-11 14:11:00 +08:00
Jake Dallimore 10f9d0d51a Merge branch 'MDL-75552-402' of https://github.com/sarjona/moodle into MOODLE_402_STABLE 2023-05-11 11:23:33 +08:00
Sara Arjona 9bdfec812d Merge branch 'MDL-78040-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-10 19:45:14 +02:00
Paul Holden 78d90e3c16 MDL-78211 contentbank: fix context option when formatting categories. 2023-05-10 17:42:23 +01:00
Paul Holden d5ec3594cc MDL-78151 core: account for timezone differences in intl extension.
Recent additions to timezones from the IANA TZDB are not necessarily
reflected in those used by the intl extension and/or ICU zones:

 * America/Ciudad_Juarez
 * America/Nuuk
 * Europe/Kyiv
 * Pacific/Kanton

Create mapping to allow these zones to be used without errors.
2023-05-10 17:12:16 +01:00
Mikhail Golenkov 5303c032bb MDL-77592 filter_tex: Use request dir instead of temp shared storage 2023-05-10 13:03:29 +08:00
Andrew Nicols b2cca9ef62 Merge branch 'MDL-78034-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-10 12:59:57 +08:00
Ilya Tregubov 87736d9a0b Merge branch 'MDL-75623-MOODLE_402_STABLE' of https://github.com/ilyatregubov/moodle into MOODLE_402_STABLE 2023-05-10 11:45:49 +08:00
Stefan Hanauska b1496fa5df MDL-75623 backup: Encode pluginfile URLs 2023-05-10 11:44:45 +08:00
Paul Holden 411dc66fd9 MDL-78170 rating: consistently calculate average rating aggregation.
Ensure it's always cast by the database as a float, to avoid loss of
precision.
2023-05-09 15:57:37 +01:00
Jun Pataleta c58d3b4759 Merge branch 'MDL-78065-402' of https://github.com/HuongNV13/moodle into MOODLE_402_STABLE 2023-05-09 22:41:56 +08:00
Paul Holden 39a930f762 MDL-78149 mod_data: ensure group selector is always present. 2023-05-09 12:20:29 +01:00
Paul Holden 3493d9ebc3 MDL-78152 mod_book: set permissions required for page editing. 2023-05-09 12:11:26 +01:00
Jun Pataleta eff51c6001 Merge branch 'MDL-78093-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-09 17:26:18 +08:00
Shamim Rezaie 7365bc38b2 MDL-77451 gradereport: stress handling for multiple clicks 2023-05-09 16:57:10 +10:00
Andrew Nicols 856803faf8 MDL-75552 badges: move apiBase consumption to backpack
The apiBase in .well-known/badgeconnect.json was ignored and it was
causing some failures when connecting or sending badges to an
external backpack.
For OBv2.1, it has been changed to always use the apiBase defined
in the badgeconnect.json backpack provider.
2023-05-09 08:51:25 +02:00
Rajneel Totaram 97d935b337 MDL-77930 accesslib: php81 deprecation warnings on missing plugins 2023-05-09 17:48:45 +12:00
Eloy Lafuente (stronk7) f46e5fc229 MDL-78156 groups: Make groups_get_user_groups() order deterministic
Right now the order of the groups returned by groups_get_user_groups()
is not fixed and, every DB, can return them in any order. While 99%
of times the order will be the creation one, depending of the RDBMS
decisions, they can be returned in any order.

This is specially noticeable with Oracle, but can affect to any DB.

And that makes some tests (expecting a given order) to fail.

This commit fixes the problem by making the order of the groups
deterministic, because that's the way we use to fix these problems.

Alternative is to relax the tests so only values are asserted by
using assertEqualsCanonicalizing().
2023-05-08 18:25:05 +02:00
Petr Skoda 8a6c536b29 MDL-76688 filter_text: prevent LaTeX3 syntax 2023-05-08 10:11:55 +02:00
AMOS bot 84da51dafd Automatically generated installer lang files 2023-05-07 00:07:29 +00:00
Paul Holden 98448477d9 MDL-78135 completion: include required criteria library in test. 2023-05-05 16:45:39 +01:00
Jake Dallimore 62076a191e MDL-76821 enrol_lti: prevent legacy launches via upgraded enrolment
If the enrolment instance (the 'published resource') has been upgraded
from LTI 1.1/2.0 to LTI 1.3 (i.e. a new instance was not created),
prevent legacy launches which may occur from old resource links. Only
LTI Advantage launches should be permitted through the method.
2023-05-05 17:10:12 +08:00
Jake Dallimore b1a7ae63c3 MDL-76821 enrol_lti: fix bug in repo causing return of legacy lti users
If the enrolment method is updated from an LTI 1.1/2.0 tool to an LTI
1.3 tool, it may have associated enrol_lti_users records not having
ltideploymentid values. These are legacy users and must not be returned
by the repository, which deals only with LTI 1.3 LTI users.
2023-05-05 17:10:12 +08:00
Jun Pataleta 929ad63114 Merge branch 'MDL-76344-402' of https://github.com/stevandoMoodle/moodle into MOODLE_402_STABLE 2023-05-05 10:35:07 +08:00
Sara Arjona 29a21ee986 weekly release 4.2+ 2023-05-04 12:42:42 +02:00
Eloy Lafuente (stronk7) c721cc6803 MDL-78116 core: Run tests against Windows on GHA
Signed-off-by: Andrew Nicols <andrew@nicols.co.uk>
2023-05-04 15:41:54 +08:00
Dani Palou 2ccc6a2346 MDL-78054 airnotifier: Fix data encrypted several times 2023-05-04 12:06:28 +08:00
Stevani Andolo cd3643a149 MDL-76344 course: Fixed course image 'non image file' layout 2023-05-04 10:28:03 +08:00
Jake Dallimore 2138619b01 Merge branch 'MDL-78002_402' of https://github.com/stronk7/moodle into MOODLE_402_STABLE 2023-05-04 10:08:09 +08:00
Ilya Tregubov 97f6672420 Merge branch 'MDL-78094-402' of https://github.com/snake/moodle into MOODLE_402_STABLE 2023-05-04 08:54:07 +08:00
Paul Holden f6afe82978 MDL-78040 block_glossary_random: switch to block test generator.
Random failures after manually adding block instances (specifically
on slow/Oracle systems) can be entirely avoided by using the block
test generator for scenarios that are not specifically concerned with
manually adding blocks.
2023-05-03 16:45:16 +01:00
Laurent David 16f91dfdb3 MDL-77781 core_completion: Completion view must be deleted too
When resetting a course, completion view entries should also be
deleted

Co-authored-by: Georg Moser <georg@moser.link>
2023-05-03 16:05:10 +02:00
Jun Pataleta da46551bea Merge branch 'MDL-77398-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 20:36:28 +08:00
Jake Dallimore 861ce57a8a Merge branch 'MDL-77384-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 16:52:21 +08:00
Jake Dallimore 048070e25f Merge branch 'MDL-78023-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 16:15:42 +08:00
Sara Arjona 223b1afabf Merge branch 'MDL-77312-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 09:59:17 +02:00
Sara Arjona 92a57c95be Merge branch 'MDL-78049-MOODLE_402_STABLE' of https://github.com/PhMemmel/moodle into MOODLE_402_STABLE 2023-05-03 09:45:16 +02:00
Ilya Tregubov 680644b593 Merge branch 'MDL-77320-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 15:36:34 +08:00
Sara Arjona bdaed5ec3c Merge branch '42_MDL-78057' of https://github.com/danmarsden/moodle into MOODLE_402_STABLE 2023-05-03 09:22:39 +02:00
Sara Arjona 812219fcb2 Merge branch 'MDL-76971-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 09:18:23 +02:00
Sara Arjona 514865575c Merge branch 'MDL-78006-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 09:04:35 +02:00
Ilya Tregubov 1b1c1a56b1 Merge branch 'MDL-77810-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 13:08:32 +08:00
Ilya Tregubov 33f62c3309 Merge branch 'MDL-77987_402' of https://github.com/AnupamaSarjoshi/moodle into MOODLE_402_STABLE 2023-05-03 12:40:12 +08:00
Jake Dallimore 0f66c8fe5c Merge branch 'MDL-78052-402' of https://github.com/sarjona/moodle into MOODLE_402_STABLE 2023-05-03 12:06:45 +08:00
Ilya Tregubov a56ca931aa Merge branch 'MDL-77546-402' of https://github.com/mihailges/moodle into MOODLE_402_STABLE 2023-05-03 10:57:05 +08:00
Jun Pataleta 453ea97395 Merge branch 'MDL-77394-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 10:31:07 +08:00
Jun Pataleta 4e9be8c131 Merge branch 'MDL-78038-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 10:25:37 +08:00
Ilya Tregubov a7055da32d Merge branch 'MDL-77936-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 10:07:40 +08:00
Jun Pataleta bd85500e2a Merge branch 'MDL-78011-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-03 09:58:10 +08:00
Jake Dallimore e0e94dbf84 MDL-78094 webservice_soap: fix use of core_external in locallib 2023-05-03 09:43:29 +08:00
Ilya Tregubov 9de24c27c6 Merge branch 'MDL-76835-402' of https://github.com/aya-saad1/moodle into MOODLE_402_STABLE 2023-05-03 09:29:32 +08:00
David Woloszyn 89215b79fb MDL-77840 enrol_lti: Avoid passing nulls to base64_encode 2023-05-03 09:34:29 +10:00
Paul Holden 4065904ad1 MDL-78093 gradereport_grader: handle modal retrieval promise failures. 2023-05-02 16:19:52 +01:00
Paul Holden 3862ec015d MDL-78093 grade: standardize additional external parameter type. 2023-05-02 16:19:38 +01:00
Sara Arjona c516a6fc14 Merge branch 'MDL-77858-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-05-02 16:49:48 +02:00
Sara Arjona fb14c67dec Merge branch 'MDL-77791_402' of https://github.com/dvdcastro/moodle into MOODLE_402_STABLE 2023-05-02 12:03:53 +02:00
Jun Pataleta b297347f12 Merge branch 'MDL-76857-402' of https://github.com/sarjona/moodle into MOODLE_402_STABLE 2023-05-02 15:45:09 +08:00
Huong Nguyen b89351f084 MDL-78065 tiny_link: Fix cannot create link for selection text 2023-05-02 11:38:01 +07:00
David Woloszyn b78a8983ed MDL-77840 lti: Avoid passing nulls to base64_encode 2023-05-02 13:50:14 +10:00
David Woloszyn 84ddb8c655 MDL-77840 backup: Avoid passing nulls to base64_encode 2023-05-02 13:50:14 +10:00
David Woloszyn cc3828c85a MDL-77840 mnet: Avoid passing nulls to base64_encode 2023-05-02 13:50:14 +10:00
Ilya Tregubov 7af8bddad7 Merge branch 'MDL-78025_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-05-02 11:43:12 +08:00
Dan Marsden 3bdfc594b6 MDL-78057 core_user: Use correct class for context check. 2023-05-01 08:50:40 +12:00
Eloy Lafuente (stronk7) c6ff4c551e MDL-78002 phpunit: Ensure that all uses of psr streams are closed
While the uses here were not causing too much problem with PHPUnit
execution in any OS, better have them explicitly closed to better
serve as reference for other, future uses anywhere in codebase.

Always that a stream is used, better we close it as soon as possible,
not relying on destructors, gc and friends.
2023-04-29 23:08:27 +02:00
Eloy Lafuente (stronk7) b6531bf613 MDL-78002 moodlenet: Always close the request stream explicitly
And do it as soon as it's not needed any more. Else, only
_destruct() / shutdown / gc will, and that can be problematic
if many streams are open, or, under some environments like
Windows that consider the stream underlying files still busy,
because they have not been closed.
2023-04-29 20:33:09 +02:00
Paul Holden 7c4fc1725f MDL-77810 gradereport_summary: show localised plugin name in report. 2023-04-27 15:19:27 +01:00
Ilya Tregubov 4f625c1e2e weekly release 4.2+ 2023-04-27 19:28:33 +08:00
Sara Arjona 99e38b7118 MDL-78052 lib: Set Moodle files after Font Awesome upgrade 2023-04-27 13:22:20 +02:00
Sara Arjona 5650cab0d6 MDL-78052 theme: Update FontAwesome to 6.4.0
This version also fixes a regression in 6.3.0 where a number of
icons weren't centered properly in their viewboxes.
2023-04-27 13:22:20 +02:00
Sara Arjona 4b23b98e16 MDL-76857 filter_displayh5p: Improve behat tests
Although the screenshots in the failures for some of the scenarios in
filter/displayh5p/tests/behat/h5p_filter.feature, like "Render a local
H5P file as teacher" were displaying the expected result, there were
some javascript errors (probably due to behat is quicker and the
iframes were not always ready).
I've added one extra step before accessing the iframe to give more
time to the H5P player to load and confirm the page is displayed
properly.
2023-04-27 11:21:26 +02:00
Paul Holden c7595a7169 MDL-77320 tool_licensemanager: restrict exposure of user sesskey. 2023-04-27 09:33:33 +01:00
Paul Holden b97ffab51a MDL-77936 grade: omit second cell action divider when not required. 2023-04-27 08:42:52 +01:00
Philipp Memmel f1633ba0f8 MDL-78049 core_external: Run test_all_external_info in separate process 2023-04-27 08:30:57 +02:00
Mihail Geshoski 3f4b46b16a MDL-77546 gradereport_singleview: Fix item order in grade item selector 2023-04-27 11:59:06 +08:00
danghieu1407 32df1530ff MDL-77883 forms: fix display of client-side validation for textareas 2023-04-27 11:08:42 +08:00
Jun Pataleta 20e1d18c29 Merge branch 'MDL-77997_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE 2023-04-27 10:40:49 +08:00
Paul Holden 01fd68f06d MDL-78038 mod_bigbluebuttonbn: observe course format section config. 2023-04-26 16:10:45 +01:00
Tim Hunt a8a3855c6d MDL-78025 questions: improve the comment on question_references.version 2023-04-26 15:36:57 +01:00
Tim Hunt 950aa78611 MDL-78025 questions: fix PHPdoc on question_require_capability_on 2023-04-26 15:36:57 +01:00
Tim Hunt b2e36b6baa MDL-78025 quiz: fix the quiz_questions_in_use logic 2023-04-26 15:36:57 +01:00
Tim Hunt 85662b721b MDL-78025 questions: questions_in_use should check question_references
This avoids the needs for plugins to do separate queries, which is
easier for them, and better performing.
2023-04-26 15:36:56 +01:00
Tim Hunt eb6c618fd4 MDL-78025 question generator: make the behaviour less surprising
* The object returned by update_question is alwasy a new clone
  and the $question passed in will not be modified.

* The returned object has the fields like questionbankentryid and
  the ones related to versionning, so it is more like the data
  returned by question_bank::load_question_data.
2023-04-26 15:36:56 +01:00
Paul Holden d43dc80d65 MDL-78034 mod_bigbluebuttonbn: format instance group names. 2023-04-26 15:31:38 +01:00
Tim Hunt 8e1583455e MDL-78025 question: move hiding logic into question_delete_question
This logic belongs in the API, so it is applied consistently.

Also this avoids calling the expensive function questions_in_use
twice per question.
2023-04-26 15:30:58 +01:00
Aya Saad 4bfce15818 MDL-76835 theme: Fix unordered lists indentation 2023-04-26 14:01:47 +02:00
Ilya Tregubov 6b8aeb5c90 Merge branch 'MDL-76929-402' of https://github.com/ilyatregubov/moodle into MOODLE_402_STABLE 2023-04-26 09:28:52 +08:00
Matt Porritt d9f71f0666 MDL-76929 Libraries: Upgrade phpxmlrpc to 4.10.1 2023-04-26 09:26:40 +08:00
David Castro 9e0d12e5ae MDL-77791 data: Fix file attachment to search doc 2023-04-25 19:56:26 -05:00
Paul Holden 86fd45f0de MDL-78023 tool_policy: cast timemodified column on table download. 2023-04-25 14:51:04 +01:00
Sara Arjona ffd32bacba Merge branch 'MDL-77313-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE 2023-04-25 15:18:35 +02:00
Paul Holden 3ee04ecf78 Merge branch 'MDL-78007-402' of https://github.com/HuongNV13/moodle into MOODLE_402_STABLE 2023-04-25 12:36:08 +01:00
Max Larkin c675170c4e MDL-73331 tool_brickfield: Update advanced tab display 2023-04-25 12:04:36 +01:00
Paul Holden 0c74bbfa06 Merge branch 'MDL-77766-402-2' of https://github.com/junpataleta/moodle into MOODLE_402_STABLE 2023-04-25 09:38:36 +01:00
Anupama Sarjoshi 4f7ccd0432 MDL-77987 Backup: add progress tracking to some slow steps 2023-04-25 09:19:36 +01:00
Paul Holden 4806324231 MDL-77384 check: clarify statistics check name. 2023-04-25 09:05:45 +01:00
Paul Holden 9c779fefc7 MDL-76971 reportbuilder: switch remaining classes to external_api.
Continues on the work started in a3cc26f8, to remove the last
remnants of usage of previous external API classes.
2023-04-25 08:50:27 +01:00
Paul Holden b82cc59782 MDL-78011 qbank_managecategories: require library for pagesize const. 2023-04-24 15:35:47 +01:00
Jun Pataleta e38a933fa2 MDL-77766 qtype_truefalse: Respect showstandardinstruction
* When showstandardinstruction is set to no, replace the standard
instruction with the generic "Answer" text for the answer options
fieldset's legend.
2023-04-24 20:11:10 +08:00
Jun Pataleta 9ef5ed8527 MDL-77766 qtype_multichoice: Respect showstandardinstruction
* When showstandardinstruction is set to no, replace the standard
instruction with the generic "Answer" text for the answer options
fieldset's legend.
2023-04-24 20:11:10 +08:00
Marina Glancy f1afcf6616 MDL-78006 course: test for adding activity in a new section 2023-04-24 11:42:07 +01:00
Paul Holden 0a05336551 MDL-78006 course: register activity chooser listeners just once. 2023-04-24 11:41:57 +01:00
Tim Hunt a9c5734f04 MDL-77997 questions: add back Export as XML to the preview screen
The used the exist in Moodle up to 3.11, but then was removed with
insufficient thought in 4.0 (because we had grander long-term plans
which still have not happened). Until those plans happen, this
commit adds the simple link back on the preview screen.
2023-04-24 11:30:28 +01:00
Paul Holden 1e81424bdd MDL-77312 files: exclude drafts when determining license usage. 2023-04-24 11:08:18 +01:00
Paul Holden 4aaaaa5f57 MDL-77313 restore: re-add field to indicate course/category search.
When the two restore forms for searching courses and categories were
converted to core templates in eb9935c9 they lost the named submit
button, which broke searching.
2023-04-24 11:05:13 +01:00
Paul Holden 963b56cf7e MDL-77858 javascript: correct core/notification exception imports. 2023-04-24 10:45:55 +01:00
Paul Holden f3368a55b5 MDL-77394 mod_forum: de-couple discussion pinned/starred options. 2023-04-24 10:38:28 +01:00
Paul Holden 37564d61d5 MDL-77398 mod_assign: disable form submit protection for batch options. 2023-04-24 10:35:49 +01:00
Huong Nguyen 94a87bc47e MDL-78007 tiny_media: Fix wrong condition for the Tiny Media
Including in this commit:
 - Switched to Tiny editor in manually_mark_question.feature
2023-04-24 15:59:26 +07:00
Jun Pataleta e6615e587f MDL-78000 upgrade: add the 4.2.0 separation line to all upgrade scripts 2023-04-24 13:22:41 +08:00
Jun Pataleta ae4efa96ee Moodle release 4.2 2023-04-22 17:06:55 +08:00
Eloy Lafuente (stronk7) 2204fd7ad7 Moodle release 4.2rc2 2023-04-21 19:19:59 +02:00
Eloy Lafuente (stronk7) ae4d40b517 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-04-21 19:19:53 +02:00
Jake Dallimore 0074137749 Merge branch 'MDL-77889-integration-master-fix' of https://github.com/mihailges/moodle 2023-04-21 17:15:26 +08:00
Mihail Geshoski ad7839f6ff MDL-77889 gradebook: Tighten up backward compatibility checks 2023-04-21 16:53:47 +08:00
Jun Pataleta d3fa6641a2 Merge branch 'MDL-77229-patch' of https://github.com/ilyatregubov/moodle 2023-04-21 16:44:22 +08:00
Ilya Tregubov a0b40bd104 MDL-77229 mod_lesson: Black list detailed statistics in classic Behat.
The nav element to go to detailed stats page is missing in classic
2023-04-21 15:03:02 +08:00
Shamim Rezaie e38262e271 MDL-77889 gradereport: restore backwards compatibility in searchwidget
The widgetbase module was intended to be a generic search widget,
despite its location in grade/amd/src. As such, other modules may
depend on this. This was modified in MDL-76246, which added new
requires params to the js, and changed the js to expect certain new
data attributes in the templates. This broke b/c for existing
dependents.

This patch makes sure the existing uses of the basewidget continue
to work by adding b/c code. See MDL-77991 which deals with deprecating
this search widget and replacing it with one that just implements the
desired combobox logic, without the b/c code. That issue should also
make it abundantly clear that this widget is for public consumption.
2023-04-21 14:19:43 +08:00
Jun Pataleta 8dd488cb5b Merge branch 'MDL-77989-master' of https://github.com/andrewnicols/moodle 2023-04-21 13:44:51 +08:00
Andrew Nicols fcba0cb379 MDL-77989 core: Fix uses of legacy external API 2023-04-21 13:33:56 +08:00
Andrew Nicols 1a53cbbae4 MDL-77989 testing: Add test file isolation helper
When we deprecate the use of a file, we often include tests which ensure
that the legacy behaviour is maintained. There are also legacy uses
in the community where people would like to use the deprecated API for a
period.

The issue that we face is that, if the deprecated file is included once,
then it will be included for all other, unrelated, tests. This means
that other tests may not detect cases where the deprecated file was
included.

We can solve these cases by running the test that performs the inclusion
in a deprecated process. This means that the inclusion is only performed
in that isolated process, and other unrelated tests do not include the
file.

However, we also then need to detect which files which are including the
file and which we do not know about.

This change introduces:
- an override to the TestCase::setInIsolation method to define a
  constant when the test is running in isolation
- a new function that a file can call when it is included, to make sure
  that the test process was isolated, where there is any test.
2023-04-21 13:33:56 +08:00
Ilya Tregubov 04bf346ca3 Merge branch 'MDL-77903' of https://github.com/Chocolate-lightning/moodle 2023-04-21 13:18:14 +08:00
Jun Pataleta 19022cd940 Merge branch 'MDL-77927-master' of https://github.com/stevandoMoodle/moodle 2023-04-21 13:11:43 +08:00
Mathew May f9c6548189 MDL-77903 gradereport_grader: Keyboard accessibility 2023-04-21 13:09:25 +08:00
Jun Pataleta 4bf6bb37c2 MDL-77927 core: Delete other mod_assignment subplugins
Non-core mod_assignment subplugin data may still be present on the
database. We need to make sure to remove these too during upgrade.
2023-04-21 12:32:10 +08:00
Jun Pataleta 0720524804 MDL-77927 core: mod_assignment subplugins environment check 2023-04-21 12:32:06 +08:00
Jun Pataleta dddc9a08cd MDL-77927 core: Move assignment removal upgrade code
Move the fixed assignment removal upgrade code to the end of the upgrade
script as a new upgrade step. Already upgraded sites with mod_assignment
removed should just be able to rerun this without any issues.
2023-04-21 12:31:11 +08:00
Stevani Andolo d023b5356c MDL-77927 grade: Delete mod_assignment orphaned data before its removal 2023-04-21 12:31:07 +08:00
Ilya Tregubov ad401db0f8 Merge branch 'MDL-77229-master' of https://github.com/ilyatregubov/moodle 2023-04-21 12:11:59 +08:00
Ilya Tregubov 1601a2610f MDL-77229 lesson: Add Behat test 2023-04-21 12:02:34 +08:00
Andrew Nicols ba81947f43 Merge branch 'MDL-77849-master' of https://github.com/ilyatregubov/moodle 2023-04-21 11:31:22 +08:00
Jun Pataleta e07f28e276 Merge branch 'MDL-77896' of https://github.com/paulholden/moodle 2023-04-21 11:21:40 +08:00
Mihail Geshoski bc977c3588 MDL-77849 gradereport_grader: Align content in user identity cells 2023-04-21 09:59:30 +08:00
Ilya Tregubov 2bfd75d9a0 MDL-77849 gradereport_grader: Align properly grade display types 2023-04-21 09:59:30 +08:00
Ilya Tregubov 4c699d007a MDL-77849 gradereport_grader: Make menus aligned with text 2023-04-21 09:59:25 +08:00
Shamim Rezaie 39c4e7f3cb MDL-77849 gradereport_grader: Switch from px to rem values 2023-04-21 09:58:58 +08:00
Shamim Rezaie 3816a64f32 MDL-77849 gradereport_grader: Numerical grades should be right-aligned 2023-04-21 09:58:50 +08:00
Andrew Nicols f7d7ad7fed MDL-77989 core_external: Isolate testing of deprecated file
The inclusion of this deprecated file leads to tests passing which may
fail when run in a different order, or for just a single testsuite.
2023-04-21 09:33:53 +08:00
Dan Marsden 9d162d1b8a MDL-77989 webservices: fix unit test error with xmlize_result 2023-04-21 09:31:57 +08:00
AMOS bot 2a5bf37102 Automatically generated installer lang files 2023-04-21 00:07:45 +00:00
Paul Holden 571292b6eb MDL-77896 editor_tiny: approximate height for non-visible editors.
When an editor is renderer initially invisible to the browser, e.g.
the forum "Add discussion" form, it has a `clientHeight` value of
zero. We can approximate an alternative value based on the number
of rows in the textarea.

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2023-04-20 15:24:23 +01:00
Juan Leyva f14c09406a MDL-77229 lesson: Fix error for empty responses (numerical pagetype) 2023-04-20 12:46:21 +02:00
Jun Pataleta 445a139d21 Merge branch 'MDL-73012-master' of https://github.com/ferranrecio/moodle 2023-04-20 16:32:15 +08:00
Jun Pataleta a14f23aa2a Merge branch 'MDL-77922-master' of https://github.com/ferranrecio/moodle 2023-04-20 16:09:56 +08:00
Ilya Tregubov 1c25a0cc2f Merge branch 'MDL-77577-master' of https://github.com/andelacruz/moodle 2023-04-20 12:33:23 +08:00
Andrew Nicols 6732d8819d Merge branch 'MDL-77973-master' of https://github.com/snake/moodle 2023-04-20 12:14:40 +08:00
Jake Dallimore fffc7ebf7c MDL-77973 core: fix broken navigation when moodlenet misconfigured
Instead of failing with an exception, throw a debugging notice.
2023-04-20 11:47:54 +08:00
Ilya Tregubov 05a0d7c8b6 Merge branch 'MDL-77918' of https://github.com/Chocolate-lightning/moodle 2023-04-20 09:32:16 +08:00
Andrew Nicols 59d42e1ed2 MDL-77718 editor_tiny: Restrict the revision to int for loaders
The revision should always be an int. I suspect this was missed during
debugging and not corrected.
2023-04-19 16:44:19 +00:00
Paul Holden 5521d1d6e8 MDL-77187 mod_wiki: validate external method sort parameters. 2023-04-19 16:44:19 +00:00
Paul Holden a8da761f8b MDL-77959 moodlenet: void return type style fixes in test. 2023-04-19 17:35:12 +01:00
Paul Holden 5338fc591e Merge branch 'MDL-77959-master' of https://github.com/HuongNV13/moodle 2023-04-19 17:25:14 +01:00
Jun Pataleta ad37980aeb Merge branch 'MDL-77955' of https://github.com/paulholden/moodle 2023-04-19 23:45:25 +08:00
Paul Holden c81bfc4f45 Merge branch 'MDL-77897-master' of https://github.com/andrewnicols/moodle 2023-04-19 14:13:03 +01:00
Paul Holden 1af2d18adb Merge branch 'MDL-77960-master' of https://github.com/lameze/moodle 2023-04-19 13:41:31 +01:00
Paul Holden b952c16086 Merge branch 'MDL-77944-master' of https://github.com/andrewnicols/moodle 2023-04-19 13:06:40 +01:00
Huong Nguyen 5548b91e3e MDL-77959 core_moodlenet: Convert activity intro to plaintext 2023-04-19 17:40:21 +07:00
Paul Holden f2f44e5ec9 MDL-77932 gradereport_grader: simplify range/average cell collapsing. 2023-04-19 11:27:43 +01:00
Paul Holden 078e0fd885 Merge branch 'MDL-77932-master' of https://github.com/mihailges/moodle 2023-04-19 11:25:59 +01:00
Ferran Recio 86fe8e582e MDL-73012 core_courseformat: add pending to move section modal 2023-04-19 12:15:32 +02:00
Jun Pataleta 02ba4ceefa Merge branch 'MDL-77940' of https://github.com/stronk7/moodle 2023-04-19 17:43:23 +08:00
Jake Dallimore 555ad338bf Merge branch 'MDL-77958-master' of https://github.com/andrewnicols/moodle 2023-04-19 17:08:14 +08:00
Andrew Nicols 3ac1acacca MDL-77958 moodlenet: Various style fixes
This change contains various style fixes which I encountered and fixed
whilst addressing the other issues identified in this issue.
2023-04-19 16:12:50 +08:00
Andrew Nicols 581ccb9a47 MDL-77958 moodlenet: Pass stored_file to improve memory usage
Previously the content of the stored file was extracted and stored in a
variable, passed around, and then submitted to MoodleNet. This results
in very high memory consumption when dealing with MoodleNet.

The stored_file should be passed around as a first-level param to
discourage this, and the content should _never_ be loaded into memory.
Instead file streams and resources should be used to allow Guzzle/Curl
to buffer the file from disk/other storage straight to MoodleNet.
2023-04-19 16:12:50 +08:00
Paul Holden 8d3b99d2a3 Merge branch 'MDL-77898-master' of https://github.com/junpataleta/moodle 2023-04-19 09:03:22 +01:00
Jun Pataleta 07243a3ae3 Merge branch 'MDL-77785' of https://github.com/timhunt/moodle 2023-04-19 15:45:55 +08:00
Andrew Nicols 489a53ceb2 MDL-77897 editor_tiny: Save editor content on editor blur 2023-04-19 14:57:10 +08:00
Mathew May b0aff926da MDL-77918 gradereport_grader: zindex the dropdowns to overlap better 2023-04-19 14:26:42 +08:00
Simey Lameze 4e6528182f MDL-77960 behat: make verification steps more specific 2023-04-19 14:09:58 +08:00
Andrew Nicols 96a1a0abce MDL-77958 file: Add psr stream functionality to file API
This change introduces a new get_psr_stream() method to:
* stored_file
* file_system

This allows us to fetch a Psr Stream implementing the
PSR\Http\Message\StreamInterface and pass it into Guzzle, which means
that there is no need to load the entire file content into memory to
serve it.
2023-04-19 13:51:49 +08:00
Ilya Tregubov 43205a0460 Merge branch 'MDL-77935' of https://github.com/paulholden/moodle 2023-04-19 13:26:15 +08:00
Jun Pataleta b1954bfdf9 Merge branch 'MDL-77953' of https://github.com/stronk7/moodle 2023-04-19 12:37:55 +08:00
Andrew Nicols a089496f96 Merge branch 'MDL-77954' of https://github.com/paulholden/moodle 2023-04-19 11:16:50 +08:00
Mihail Geshoski 71241e64a5 MDL-77932 gradereport_grader: Make range row cells collapsible 2023-04-19 10:09:57 +08:00
Paul Holden 78d24550af MDL-77955 moodlenet: destroy backup controller in class destructor.
This ensures that it's always cleaned up during tests, where not doing
so can cause spurious errors on Windows.
2023-04-18 22:42:13 +01:00
Paul Holden fd8184a295 MDL-77954 moodlenet: store packaged activities in user draft.
We shouldn't invent fileareas with invalid values (specifically in
this case, the `itemid` overflowed maximum length of the field on
Oracle).

Given the generated file is transitory in nature, instead store it
in the users draft area.
2023-04-18 18:40:15 +01:00
Eloy Lafuente (stronk7) 30e94a8916 MDL-77953 pagelib: Ensure that null $SCRIPT continues behaving the same
It's possible to have some Moodle components soft linked instead
of being real directories within codebase (within dirroot).

For example, Composer's "vendor" directory can be soft linked
(from elsewhere), or also plugins can be installed using soft
links.

In those cases, Moodle calculates the $SCRIPT global as null. And,
then, string operations on it are emitting a PHP deprecation message
with PHP 8.1 and up.

This fix just ensures that the behaviour is the same than before
PHP 8.1, aka: ltrim(null) = '' (empty string), without any PHP warning.
2023-04-18 18:48:58 +02:00
Eloy Lafuente (stronk7) c2b716a8cc MDL-77940 versions: main version bump 2023-04-18 18:09:28 +02:00
Eloy Lafuente (stronk7) 061c9d7ba0 MDL-77940 versions: bump all versions and requires near release
version = 2023042400 release version
requires= 2023041800 current rc1 version
2023-04-18 18:08:09 +02:00
Paul Holden 7343c65bea Merge branch 'MDL-77941-master' of https://github.com/aanabit/moodle 2023-04-18 16:57:40 +01:00
Amaia Anabitarte f4a172afde MDL-77941 blocks_overview: Remove duplicated strings for zero states 2023-04-18 17:36:57 +02:00
Andrew Nicols 3933cbfb5a Merge branch 'MDL-77895' of https://github.com/paulholden/moodle 2023-04-18 23:34:59 +08:00
Andrew Nicols 7beda01cae Moodle release 4.2rc1 2023-04-18 22:29:14 +08:00
Andrew Nicols 5124b6747c NOBUG: Fixed SVG browser compatibility 2023-04-18 22:29:11 +08:00
Andrew Nicols 09912bfefa Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-04-18 22:29:10 +08:00
Ferran Recio f81b79a4b1 MDL-77922 core_courseformat: add pending to move activity modal 2023-04-18 13:22:08 +02:00
Jake Dallimore c9e8aa0406 Merge branch 'MDL-75316-master-4' of https://github.com/mickhawkins/moodle 2023-04-18 17:24:55 +08:00
Michael Hawkins 2e024f304a MDL-75316 core: MoodleNet integration final improvements 2023-04-18 17:00:54 +08:00
Huong Nguyen 58ced4add0 MDL-75316 core_moodlenet: Share to MoodleNet modal and activity menu
Originally implemented as MDL-75785
2023-04-18 17:05:07 +08:00
Huong Nguyen 6a877d438b MDL-75316 core: Webservice for sending activity to MoodleNet
Originally implemented as MDL-75933
2023-04-18 17:04:46 +08:00
Michael Hawkins 42ba0492e2 MDL-75316 core: Corrected oauth2_client::get_accesstoken() docblock
Originally implemented as MDL-75932
2023-04-18 17:04:30 +08:00
Michael Hawkins 77f85ed287 MDL-75316 core: Add activity sender & moodlenet_client to MoodleNet API
This makes it possible to share a single activity to a MoodleNet
instance (which has been enabled for sharing in site admin).
This utilises the core\moodlenet\activity_packager to create an
activity backup, then sends it using the MoodleNet create resource
API specification.

Originally implemented as MDL-75932
2023-04-18 17:04:14 +08:00
raortegar 9bc769a610 MDL-75316 core: Add activity packager to MoodleNet API
This makes it possible to package a single activity as a Moodle backup
file, excluding user data so it is ready to be shared as a MoodleNet
resource.

Co-authored-by: Michael Hawkins <michaelh@moodle.com>

Originally implemented as MDL-75932
2023-04-18 17:03:45 +08:00
Michael Hawkins d6c4c0fbbd MDL-75316 core: Set up MoodleNet API structure and utilities helper
Initial folder structure and declaring API.
Created utilities class.

Originally implemented as MDL-75932
2023-04-18 17:03:18 +08:00
Huong Nguyen cd097f117b MDL-75316 core_moodlenet: Rename settings
Originally implemented as MDL-75319
2023-04-18 17:03:02 +08:00
Huong Nguyen 7727745bf7 MDL-75316 core_moodlenet: Create MoodleNet capability
Originally implemented as MDL-75319
2023-04-18 17:02:47 +08:00
Huong Nguyen 852e31dbc4 MDL-75316 tool_moodlenet: Rename setting section
Rename the existing section from "MoodleNet settings" to "MoodleNet inbound settings"

Originally implemented as MDL-75319
2023-04-18 17:02:19 +08:00
Huong Nguyen ef2a1934a0 MDL-75316 core_moodlenet: Add setting to control sharing
Originally implemented as MDL-75319
2023-04-18 17:01:38 +08:00
Huong Nguyen d9a6577410 MDL-75316 admin: Create Share to MoodleNet experimental setting
Originally implemented as MDL-75319
2023-04-18 17:00:54 +08:00
Jun Pataleta 4df52460b5 MDL-77898 calendar: Add iconclass for upcoming_mini template
The icon's iconclass context data adds additional CSS class(es) to
calendar event icons to better control how the event icon is displayed.
e.g. without filtering for activity events that don't hae monologo
versions of their icons.
2023-04-18 15:58:09 +08:00
Paul Holden adb6d5468e MDL-77895 editor_tiny: standardize quickbar selection toolbar.
Ensure the same heading tags are available as those defined in the
editor block formats configuration (c51b7e2c).

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2023-04-18 07:46:05 +01:00
Ilya Tregubov 34d7edf079 Merge branch 'MDL-77916' of https://github.com/paulholden/moodle 2023-04-18 14:27:49 +08:00
Andrew Nicols 797f03228b Merge branch 'MDL-77893-master' of https://github.com/jleyva/moodle 2023-04-18 13:28:12 +08:00
Andrew Nicols 825e621264 Merge branch 'MDL-77735-master' of https://github.com/sarjona/moodle 2023-04-18 12:11:08 +08:00
Ilya Tregubov aac60d73a1 Merge branch 'MDL-77770' of https://github.com/paulholden/moodle 2023-04-18 12:01:28 +08:00
Ilya Tregubov 43c2c25645 Merge branch 'MDL-76855' of https://github.com/Chocolate-lightning/moodle 2023-04-18 11:17:43 +08:00
Andrew Nicols 5e4559c85a Merge branch 'MDL-77355' of https://github.com/paulholden/moodle 2023-04-18 10:32:49 +08:00
Ilya Tregubov 6255f92d66 Merge branch 'MDL-77943' of https://github.com/paulholden/moodle 2023-04-18 10:17:45 +08:00
Andrew Nicols df2e6c1cd4 Merge branch 'MDL-77902' of https://github.com/Chocolate-lightning/moodle 2023-04-18 10:10:39 +08:00
Mathew May ae6826953e MDL-77902 gradereport_grader: Clear btn & user differentiation 2023-04-18 09:59:13 +08:00
Andrew Nicols dfec1a8e00 MDL-77944 behat: Rename chrome options for w3c support
From Selenium 4.8.0, support for non-w3c browser control has ended.

We only use W3C browser control these days, and this was missed as part
of the move to W3C. All browser options must be vendor-prefixed.
2023-04-18 09:03:35 +08:00
Ilya Tregubov 688c9b13d4 Merge branch 'MDL-77827-master' of https://github.com/HuongNV13/moodle 2023-04-18 08:58:33 +08:00
AMOS bot e93fd454a2 Automatically generated installer lang files 2023-04-18 00:07:41 +00:00
Paul Holden ba64c15814 MDL-77943 group: use shorter names for visibility report elements. 2023-04-17 19:36:55 +01:00
Paul Holden 6a5a787844 Merge branch 'MDL-77878-master-enfix' of https://github.com/vmdef/moodle 2023-04-17 19:12:36 +01:00
Juan Leyva cf76d1bf9f MDL-77893 airnotifier: Apply payload size optimisation to all push 2023-04-17 15:36:28 +02:00
Juan Leyva 862a9fb24c MDL-77893 airnotifier: Allow configuring how to process encrypted notifs 2023-04-17 15:36:28 +02:00
Paul Holden 71cdfae287 Merge branch 'MDL-77842-master' of https://github.com/sarjona/moodle 2023-04-17 13:49:58 +01:00
Juan Leyva bdf525a43e MDL-77893 airnotifier: Leave only message data processed by Airnotifier 2023-04-17 13:34:55 +02:00
Paul Holden f2c1e6c114 Merge branch 'MDL-76212-master-nav' of https://github.com/kevpercy/moodle 2023-04-17 11:49:23 +01:00
Paul Holden 44e3cb05e5 Merge branch 'MDL-77324-master-2' of https://github.com/ilyatregubov/moodle 2023-04-17 11:05:55 +01:00
Juan Leyva 964ad9d264 MDL-77893 airnotifier: Allow to set publickey when creating new device 2023-04-17 11:03:15 +02:00
Paul Holden b4b88da77d MDL-77935 contentbank: avoid phpunit crashes during isolated tests.
Simplify the test for allowed contexts by removing problematic use of
data provider annotation.

See: https://github.com/sebastianbergmann/phpunit/issues/2739
2023-04-17 09:26:16 +01:00
Víctor Déniz b576b068bd MDL-77878 lang: Use fixed strings in tests 2023-04-17 08:49:59 +01:00
Mathew May fbc51cd591 MDL-77902 gradebook: Ensure dyn search works with pagination 2023-04-17 13:10:56 +08:00
Mathew May 53675693b4 MDL-76855 gradereport_user: Prevent parent access errors 2023-04-17 11:24:51 +08:00
Andrew Nicols 35118869c7 Merge branch 'MDL-77874' of https://github.com/paulholden/moodle 2023-04-17 11:20:53 +08:00
Helen Foster ee8408c4d5 MDL-77878 lang: Import fixed English strings (en_fix) 2023-04-14 13:08:38 +01:00
Sara Arjona d2e27ec8bb Merge branch 'MDL-77913' of https://github.com/paulholden/moodle 2023-04-14 14:02:08 +02:00
Sara Arjona ed53d81dc7 MDL-77842 badges: Improve debugging information for Badgr
In MDL-77086 some extra information was added when a badge can't be
sent to a backpack. However, as the Badgr is not following the
specification, it's still hard to debug it when it fails (as
raised in MDL-75552, Badgr is not working because, in some cases,
it's returning the "Method Not Allowed / Request method 'POST'
not supported" error.
2023-04-14 13:47:23 +02:00
Sara Arjona 440edc5e42 MDL-77735 core: Check $CFG->lang isset
In some cases, $CFG->lang might not be set, and this is causing a
Notice to be displayed when, for instance, database connection fails.
This patch should fix this case.
2023-04-14 13:46:18 +02:00
Sara Arjona 0e08d0df60 Moodle release 4.2beta 2023-04-14 10:54:08 +02:00
Sara Arjona 7e71cbce68 NOBUG: Fixed SVG browser compatibility 2023-04-14 10:54:05 +02:00
Sara Arjona c7987a7547 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-04-14 10:54:04 +02:00
Huong Nguyen f5867c078d MDL-77827 events: Changed JSON comparison to be less strict 2023-04-14 12:28:55 +07:00
AMOS bot ad255c2215 Automatically generated installer lang files 2023-04-14 00:07:47 +00:00
Paul Holden 62d48a1d47 MDL-77916 h5p: register autoloader in helper testcase. 2023-04-13 23:12:13 +01:00
Paul Holden dcdeb47f39 MDL-77913 qbank_previewquestion: deterministic ordering of versions.
Ensure the ordering of loaded question versions is consistent, avoids
random Oracle failures.
2023-04-13 21:13:41 +01:00
Sara Arjona 2e20e08aa9 Merge branch 'MDL-76986-master' of https://github.com/davewoloszyn/moodle 2023-04-13 17:31:58 +02:00
Sara Arjona bdc106e840 Merge branch 'MDL-76859-master' of https://github.com/sarjona/moodle 2023-04-13 16:24:20 +02:00
Sara Arjona a9ff77113e Merge branch 'MDL-77833-course-content-chng-notiification-multilang' of https://github.com/Amrita1991/moodle 2023-04-13 16:20:00 +02:00
Sara Arjona 9ce4fb65fd Merge branch 'MDL-77164-master' of https://github.com/marinaglancy/moodle 2023-04-13 14:00:18 +02:00
Sara Arjona d46db802af Merge branch 'MDL-77860' of https://github.com/paulholden/moodle 2023-04-13 13:44:53 +02:00
Sara Arjona 2f771f3175 Merge branch 'MDL-77788-master' of https://github.com/rmady/moodle 2023-04-13 13:16:46 +02:00
Marina Glancy 8fc1486d36 MDL-77164 various: fix incorrect phpdocs 2023-04-13 11:35:06 +01:00
Sara Arjona b4b950b75c Merge branch 'MDL-77618-admin-password-autocomplete' of https://github.com/brendanheywood/moodle 2023-04-13 12:19:09 +02:00
Amrita Deb Dutta 8974cc057c MDL-77833 course: content change notification multilang processing
adding context to format_string

fix multilang in coursename

change context param
2023-04-13 11:30:43 +02:00
Sara Arjona 33d64277b7 Merge branch 'MDL-77256-master' of https://github.com/rbravod/moodle 2023-04-13 11:20:24 +02:00
Ilya Tregubov 0fdd514f11 MDL-77324 gradereport_singleview: Make action menus consistent 2023-04-13 16:57:48 +08:00
Marina Glancy 4d765cd699 MDL-77164 privacy: typehint test content writer 2023-04-13 09:43:15 +01:00
Marina Glancy fcf887919b MDL-77164 lib/pear: correct phpdocs 2023-04-13 09:43:15 +01:00
Marina Glancy 9ffbcce0ac MDL-77164 various: fix mustache template name 2023-04-13 09:43:15 +01:00
Marina Glancy 04f8fdd021 MDL-77164 various: fix javascript AMD module name 2023-04-13 09:43:15 +01:00
Sara Arjona 948e68e9be Merge branch 'MDL-77856-master' of https://github.com/junpataleta/moodle 2023-04-13 09:42:58 +02:00
Sara Arjona 57589966bc Merge branch 'MDL-77468-master' of https://github.com/rmady/moodle 2023-04-13 09:19:54 +02:00
David Woloszyn 41e5260a3b MDL-76986 editor_tiny: Convert language code format for getting strings 2023-04-13 16:01:44 +10:00
Ilya Tregubov dd1a41f2d8 Merge branch 'MDL-75274-weekly' of https://github.com/Chocolate-lightning/moodle 2023-04-13 13:38:14 +08:00
Mathew May 3a8eeedf6a MDL-75274 theme_boost: Aria so dropdowns with search focus better 2023-04-13 11:45:17 +08:00
Mathew May 1a1939ac29 MDL-75274 gradereport_grader: Column collapsing 2023-04-13 11:45:17 +08:00
Ilya Tregubov e285841a9a MDL-75274 core_grades: Add % symbol to weights column
As per design it should have % symbol.
2023-04-13 11:44:38 +08:00
Ilya Tregubov e3a4dcf056 MDL-75274 gradereport_grader: Add back advanced grading url
It was accidentally removed.
2023-04-13 10:42:04 +08:00
Ilya Tregubov 277b55199e MDL-75274 gradereport_grader: Fix sorting of grade items.
Seems that baseurl is rewritten causing toggling of ordering
not work
2023-04-13 10:42:04 +08:00
Ilya Tregubov cfbb0ea4d5 Merge branch 'MDL-70975-adhoc-carneval' of https://github.com/catalyst/moodle 2023-04-13 09:07:58 +08:00
Sara Arjona e450756ce1 Merge branch 'MDL-73610' of https://github.com/stronk7/moodle 2023-04-12 18:19:34 +02:00
Sara Arjona 16511af2a1 Merge branch 'MDL-77012' of https://github.com/paulholden/moodle 2023-04-12 14:09:27 +02:00
Sara Arjona 3c5e26901c Merge branch 'MDL-77374-master' of https://github.com/meirzamoodle/moodle 2023-04-12 13:14:07 +02:00
Petr Skoda 43b56a90d9 MDL-76859 h5p: Fix behat failures
- Only resize if the H5P EmbedCommunicator is defined (otherwise, it was causing a
JS error)
- An unnecessary image has been removed from the greeting-card.h5p fixture package.
That way, the text will always be displayed (even if the iframe is still not
resized). Instead of replacing the original greeting-card-887.h5p file, I've
renamed it to greeting-card.h5p, to remove these ugly and unnecessary numbers
at the end of the file name).
2023-04-12 12:26:23 +02:00
Sara Arjona dbe725ac04 Merge branch 'MDL-77882' of https://github.com/paulholden/moodle 2023-04-12 12:21:13 +02:00
Sara Arjona e9327f7339 Merge branch 'MDL-77348-master' of https://github.com/meirzamoodle/moodle 2023-04-12 12:19:06 +02:00
Shamim Rezaie 0175787cc0 Merge branch 'MDL-76722-fix' of https://github.com/sarjona/moodle 2023-04-12 19:50:47 +10:00
Sara Arjona ea2e9d5920 MDL-76722 core: Fix upgrade failures with MariaDB
The 'enable' field doesn't exist, and this is causing some failures
with MariaDB (and probably with MySQL too).
2023-04-12 11:43:52 +02:00
Meirza bb7f3bd9f5 MDL-77374 libraries: Added #[AllowDynamicProperties] attribute
To temporarily prevent the PHP 8.2 warning about Dynamic Properties' deprecation,
the #[AllowDynamicProperties] property was added. We encourage anyone to perform the upgrade
as soon as the Google library complies with PHP 8.2.
2023-04-12 16:39:43 +07:00
Ilya Tregubov 99e2c31f3a Merge branch 'MDL-77585-master' of https://github.com/jleyva/moodle 2023-04-12 17:24:22 +08:00
Shamim Rezaie caa9fe6e42 Merge branch 'MDL-76722-master' of https://github.com/andrewnicols/moodle 2023-04-12 19:23:17 +10:00
Shamim Rezaie e2120da616 MDL-77871 gradereport_grader: Make sure cells are full-height 2023-04-12 09:08:19 +02:00
Meirza 8cee99346b MDL-77348 mod_lesson: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-04-12 13:56:27 +07:00
Meirza 67e583783c MDL-77348 mod_lti: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.

While working on this issue, even though it's not related to the deprecation issue,
I added 'use core_external\external_api' to avoid the 'Undefined type external_api' warning at
mod_lti_testcase::generate_tool_proxy().
2023-04-12 13:56:21 +07:00
Meirza 52f512e5cf MDL-77348 mod_scorm: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-04-12 13:05:35 +07:00
Meirza 1f78fb2562 MDL-77348 mod_data: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-04-12 13:05:28 +07:00
Kevin Percy b9ad54bad8 MDL-76212 gradebook_nav: Fixed tertiary nav for smaller screens 2023-04-12 13:29:13 +08:00
Meirza a96114571e MDL-77348 mod_glossary: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-04-12 10:04:24 +07:00
Paul Holden 9efd335f4a MDL-77882 gradereport_grader: don't search on custom identity field.
Currently throws SQL exceptions if site identity configuration has
such a field included.
2023-04-11 22:54:39 +01:00
Juan Leyva c0560689fc MDL-77468 user: Fix invalid check for group belonging 2023-04-11 09:29:58 -03:00
Juan Leyva e464d2c8a1 MDL-77468 user: Make user profile visibility consistent web and ws 2023-04-11 09:24:40 -03:00
Sara Arjona 255d5a3c5a Merge branch 'MDL-77837-master' of https://github.com/andrewnicols/moodle 2023-04-11 12:12:43 +02:00
Sara Arjona 7d750e2a46 Merge branch 'MDL-77030-master-feedback' of https://github.com/kevpercy/moodle 2023-04-11 11:17:52 +02:00
Sara Arjona dbabe07db8 Merge branch 'MDL-77148' of https://github.com/AnupamaSarjoshi/moodle 2023-04-11 10:17:03 +02:00
Sara Arjona b4feecf2f5 Merge branch 'MDL-77612-master' of https://github.com/laurentdavid/moodle 2023-04-11 10:04:35 +02:00
Sara Arjona cdeec59377 Merge branch 'MDL-76792-master' of https://github.com/jleyva/moodle 2023-04-11 09:13:08 +02:00
Kevin Percy b976b3bed0 MDL-77030 gradereport_grader: Display feedback in grader report 2023-04-11 13:16:06 +08:00
Laurent David 9f1f4de23b MDL-77612 mod_label: Label name fix
* The @@PLUGINFILE@@ placeholder or URLs should not be displayed in the
course index for labels
2023-04-11 05:24:07 +02:00
Alex Morris 38160a6f94 MDL-76722 message_airnotifier: Add encrypted notifications 2023-04-11 08:58:27 +08:00
Alex Morris 9bc236d48d MDL-76722 user: Add new update_user_device_public_key webservice 2023-04-11 08:58:27 +08:00
Alex Morris 7c843b380b MDL-76722 lib/db: Add new publickey field to user_devices table 2023-04-11 08:58:26 +08:00
Shamim Rezaie d580daaf48 Merge branch 'MDL-77686' of https://github.com/paulholden/moodle 2023-04-08 05:02:35 +10:00
AMOS bot 84a6867180 Automatically generated installer lang files 2023-04-07 00:07:39 +00:00
Paul Holden aaf231551a MDL-77874 tiny_link: define help link text language string. 2023-04-06 19:08:03 +01:00
Andrew Nicols 115d6a8b9d MDL-77837 cron: Move cron_setup_user to deprecatedlib 2023-04-06 23:19:01 +08:00
Andrew Nicols 25f1ec59d9 MDL-77837 core: Improve usage docs for cron::setup_user 2023-04-06 23:19:01 +08:00
Andrew Nicols 2dde341898 MDL-77837 core: Improve cron upgrade.txt notes 2023-04-06 23:19:01 +08:00
Andrew Nicols 5319ba9c15 MDL-77837 phpunit: Ensure that the cron user setter is used
When running an adhoc task in a unit test we should use the cron variant
of the set user method to mimic the behaviour of a real cron run.
2023-04-06 23:19:01 +08:00
Andrew Nicols 12b0f796b9 MDL-77837 cron: Ensure user is set when running tasks
We should be proactive in ensuring that the environment is clean when
running a task. We already ensure that we have a clean renderer and
other parts of the output chain, but we were not setting a clean user.

This change adds a call to setup the cron user before each task is
actually executed.
2023-04-06 23:19:01 +08:00
Paul Holden fa921f87f2 MDL-77686 logstore_legacy: final plugin uninstallation step.
This supersedes the partial uninstallation from 61cd980f, ensuring
we also now clear up any remaining data (e.g. scheduled tasks).
2023-04-06 14:46:31 +01:00
Paul Holden e80192f606 MDL-77770 gradereport_user: fix errors when no users to navigate. 2023-04-06 14:40:58 +01:00
Eloy Lafuente (stronk7) 5d9eae8042 MDL-73610 nodejs: Small updates to required packages
The main goal of this issue is to avoid scanners (Dependabot
and friends), reporting about security issues with the current
xmldom 0.6.0 package.

Note that this doesn't affect prod at all, because it's a dev
dependency, hardly exploitable. So it's not a security fix, just
a security_benefit, if something.

So here, we are updating from xmldom 0.6.0 to @xmldom/xmldom 0.8.7
(note that the package was renamed in 0.7.0, so it's the very same)

Also, when proceeding with the changes, it was detected that we
are incorrectly declaring @babel/eslint-parser as a normal dependency
instead of a development one, so we are also fixing that little detail.

The commands executed to get the changes above applied have been:

- nvm use
- npm install @xmldom/xmldom@^0.8.7 --save-dev
- npm uninstall xmldom
- npm install @babel/eslint-parser@^7.17.0 --save-dev

(we haven't run a complete re-install because we only want to modify
the minimum possible at this stage).
2023-04-06 14:59:33 +02:00
Anupama Sarjoshi e6a3295fba MDL-77148 core: Fix to export params for templates in correct format
When questions are filtered by tags in the question bank, the qtagids
params are passed in the array format. Though moodle_url handles this,
single_button::export_for_template cannot. Hence changes done in
weblib.php to provide params for export_for_template in the
suitable format.
Thanks Huong. I have added the Behat test you provided in the patch.
2023-04-06 13:22:01 +01:00
Sara Arjona bd2de8edf6 on-demand release 4.2dev+ 2023-04-06 14:03:11 +02:00
Sara Arjona 78116a0ceb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-04-06 14:02:59 +02:00
Paul Holden 997713f43e MDL-77355 webservice: Behat scenario for adding service functions. 2023-04-06 11:58:53 +01:00
Matt Porritt 6abfde47dc MDL-77355 Web services: add function class not found
Fixes a regression caused by MDL-76583 That prevents functions
being added to new or existing external services.
2023-04-06 11:46:35 +01:00
Andrew Nicols 31f82832b6 MDL-65471 core: Sort directories before hashing 2023-04-06 15:41:00 +08:00
Andrew Nicols eb1b172397 Merge branch 'MDL-65471-outageless' of https://github.com/Peterburnett/moodle 2023-04-06 08:36:25 +02:00
Ilya Tregubov e6cc70c9e7 Merge branch 'MDL-76150-patch' of https://github.com/ilyatregubov/moodle 2023-04-06 08:36:25 +02:00
Sara Arjona 84a0ad16e2 Merge branch 'MDL-73642_master' of https://github.com/tasosb/moodle 2023-04-06 08:36:24 +02:00
Shamim Rezaie 06a48988e6 MDL-76150 gradereport_grader: dropdowns were partly covered during behat 2023-04-06 08:36:24 +02:00
Paul Holden dcc32979ec Merge branch 'MDL-77802-master' of https://github.com/ferranrecio/moodle 2023-04-06 08:36:22 +02:00
Ilya Tregubov ac7f9b45a3 Merge branch 'MDL-77130-master-v2' of https://github.com/dmitriim/moodle 2023-04-06 08:35:17 +02:00
Sara Arjona 34ab6b02d9 Merge branch 'MDL-75301_master' of https://github.com/marxjohnson/moodle 2023-04-06 08:33:06 +02:00
Peter Burnett 027c770eab MDL-65471 upgrade: framework to reduce maintenance mode 2023-04-06 11:38:26 +10:00
Paul Holden 9787a885c1 MDL-77860 tool_moodlenet: use localised language strings for import. 2023-04-05 23:02:55 +01:00
Jun Pataleta e3c0c2f2c2 MDL-77856 qtype_multianswer: Use Bootstrap Popover for subq feedback
The YUI Overlay widget encloses the subquestion feedback in a div
which causes a div element to be enclosed in the subquestion span. This
leads to an accessibility issue in terms of HTML parsing as inline
elements (span) should not contain block elements (div)
The YUI Overlay widget is also not accessible as it does not really hide
the overlay contents via aria-hidden when the overlay is not being
shown. It's better if we stop using this and use Bootstrap's
popover component which is more accessible by default.

This patch also removes module.js for the qtype_multianswer plugin as
it only contains codes related to rendering the feedback contents in the
YUI overlay widget which is no longer necessary.
2023-04-06 05:33:46 +08:00
Ferran Recio 625f9646a7 MDL-77802 core_xapi: create core_xapi_get_states webservice
The xAPI get states webservice is needed for mobile APPs to check if any
new state has been stored from another device.
2023-04-05 12:59:06 +02:00
Shamim Rezaie b54fbcf532 Merge branch 'MDL-77555' of https://github.com/paulholden/moodle 2023-04-05 11:25:16 +01:00
Paul Holden 63b3e4f996 Merge branch 'MDL-69551' of https://github.com/timhunt/moodle 2023-04-05 11:25:16 +01:00
Ilya Tregubov 3d4bb4cfe4 Merge branch 'MDL-76150-master' of https://github.com/rezaies/moodle 2023-04-05 11:25:16 +01:00
Shamim Rezaie 880a67aba1 MDL-76150 gradereport_grader: Display category name cell like 2 columns 2023-04-05 11:25:15 +01:00
Shamim Rezaie 21aee2b968 MDL-76150 gradereport_grader: Make numerical grades right-aligned
- state icons follow the alignment of their respective grade type
2023-04-05 11:25:15 +01:00
Shamim Rezaie 867186cb1d MDL-76150 gradereport_grader: Split header cells to 3 visual columns
- Column width changed to 200px
2023-04-05 11:25:15 +01:00
Shamim Rezaie 086720334f MDL-76150 gradereport_grader: status icons stick to the row's buttom
- There's 20px gap between status icons
- The row height adapt to the content
2023-04-05 11:25:15 +01:00
Shamim Rezaie d93c99f19b MDL-76150 gradereport_grader: some style changes
- Table cells are top-aligned
- Cell paddings changed to 10px
- In the header row, the user detail cells don't wrap but other cells do
- Grade item names wrap when they are long
- Action menu button for the grade cells does not go to the next line
  when the cell is not in the header row
- Heading cells in the footer row are right aligned
2023-04-05 11:25:14 +01:00
Shamim Rezaie f5bda6d051 MDL-76150 gradereport_grader: render header cells from template 2023-04-05 11:25:14 +01:00
Shamim Rezaie 97f89d3438 MDL-76150 gradereport_grader: Remove striped bg colours 2023-04-05 11:25:14 +01:00
Shamim Rezaie 5a890b5ff1 MDL-76150 theme_boost: fix sticky header position on narrow screens 2023-04-05 11:25:14 +01:00
Shamim Rezaie 6ca40f597f MDL-76150 gradereport_grader: Remove abandoned CSS definitions 2023-04-05 11:25:14 +01:00
Mark Johnson 96bada8495 MDL-75301 quiz: Use "always latest" option for question previews
This will set the "alwayslatest" option when previewing a question from
the quiz according to the version setting used in the quiz slot.
2023-04-05 10:23:47 +01:00
Mark Johnson 23630ece3d MDL-75301 question: Add "always latest" option to previews 2023-04-05 10:23:47 +01:00
Paul Holden 5d0f34bde2 MDL-77555 reportbuilder: improve SQL generation within filters.
Use native ANSI SQL syntax for numeric comparisons where possible,
define filter API for the case where filters must re-use the given
field SQL while ensuring uniqueness of any field parameters.

Currently only necessary in the category filter type.
2023-04-05 09:37:37 +01:00
Srdjan 85323070e7 MDL-70975 task: adhoctasks.php - queued ad hoc tasks report
Similar to scheduled tasks report

core\task\manager::adhoc_task_from_record() now raises moodle_exception
2023-04-05 11:29:46 +10:00
Srdjan 6d9aaa8412 MDL-70975 task: Support for running only failed ad hoc tasks
* CLI adhoc_task.php: new option --failed
2023-04-05 11:05:23 +10:00
Srdjan fa61fce08d MDL-70975 task: Support for limiting the number of adhoc tasks to run
* CLI adhoc_task.php: new option --taskslimit
* CLI adhoc_task.php: --execute option is implied when other options are given
* core\task\manager::get_next_adhoc_task(): new param $number
  for limiting number of tasks to run
2023-04-05 11:05:18 +10:00
Srdjan 3491ea1650 MDL-70975 task: Support for running adhoc tasks filtered by class
* CLI adhoc_task.php: new option --classname
* core\task\manager::get_next_adhoc_task(): new param $classname
  for filtering tasks
2023-04-05 11:00:46 +10:00
Srdjan 9405b5aa6d MDL-70975 task: Support for running adhoc tasks by id
* CLI adhoc_task.php: new option --id
* cron::run_adhoc_task($taskid) for running tasks by id
* core\task\manager::get_adhoc_task($taskid) for retreival/locking
2023-04-05 10:55:18 +10:00
AMOS bot 78c8050676 Automatically generated installer lang files 2023-04-05 00:07:47 +00:00
Juan Leyva d16ed5a5e9 MDL-77788 mod_assign: Apply format_string to group names in WS 2023-04-04 18:14:32 -03:00
Paul Holden 1f6722e696 Merge branch 'MDL-77254-master' of https://github.com/sarjona/moodle 2023-04-04 17:36:51 +01:00
Paul Holden a56c646317 Merge branch 'MDL-77839-master' of https://github.com/sarjona/moodle 2023-04-04 16:46:17 +01:00
Sara Arjona 1996a7cfbf MDL-77254 backup: Backup/restore xAPI state 2023-04-04 17:23:43 +02:00
Sara Arjona c8628576e3 MDL-77254 h5p: Add support to restored states
The restored states should be treated differently, to avoid resetting
them by default the first time users access them.
In that case, the first time users access to content with restored
xAPI states, they should be displayed (instead of resetting them).
2023-04-04 17:23:43 +02:00
Tim Hunt 6f9f573a84 MDL-69551 quiz: start quiz password field should be a passwordunmask
This help accessibility and usability
2023-04-04 12:18:37 +01:00
Paul Holden 7b041826b5 Merge branch 'MDL-77712-master' of https://github.com/laurentdavid/moodle 2023-04-04 12:06:41 +01:00
Paul Holden e7294e280f MDL-74936 core: version bump to force upgrade/cache reload.
Ensure all the new context level namespaces/classes are available.
2023-04-04 10:44:23 +01:00
Paul Holden c51b7e2c44 MDL-77012 editor_tiny: correct block formats property syntax.
Co-authored-by: Hiroto Kagotani <hiroto.kagotani@gmail.com>
2023-04-04 09:53:13 +01:00
Sara Arjona 37ae308e0c MDL-77839 mod_h5pactivity: Improve behat to avoid random errors
The 'Content state is removed when an attempt is created' scenario
is failing randomly because the content for the student2 was not
always saved. Some extra steps have been added to give more time
to the player to save contents and also to check it has the
expected value.
2023-04-04 10:30:47 +02:00
Sara Arjona 9ae7853669 Merge branch 'MDL-77825' of https://github.com/Chocolate-lightning/moodle 2023-04-04 10:09:25 +02:00
Ilya Tregubov 90fa3f3390 Merge branch 'MDL-69976' of https://github.com/paulholden/moodle 2023-04-04 12:20:52 +08:00
Andrew Nicols b8fb2f43e8 Merge branch 'MDL-77584-master' of https://github.com/ewallah/moodle 2023-04-04 12:05:18 +08:00
Andrew Nicols 261bfa1b42 Merge branch 'MDL-77385-master' of https://github.com/srobotta/moodle 2023-04-04 12:03:54 +08:00
Andrew Nicols b0d5ad536b MDL-74936 core: Add context to apis.json 2023-04-04 11:24:21 +08:00
Andrew Nicols a262ba5d6e Merge branch 'MDL-74936' of https://github.com/skodak/moodle 2023-04-04 11:22:49 +08:00
Dmitrii Metelkin c11d4284be MDL-77130 cohort: add custom fields 2023-04-04 13:01:40 +10:00
AMOS bot b6d5458702 Automatically generated installer lang files 2023-04-04 00:07:48 +00:00
Paul Holden 5a85990706 Merge branch 'MDL-77338-master' of https://github.com/meirzamoodle/moodle 2023-04-03 16:48:19 +01:00
Meirza 8a5485a714 MDL-77338 backup: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-04-03 22:39:39 +07:00
Paul Holden 7fa4859b34 Merge branch 'MDL-75906-master' of https://github.com/mickhawkins/moodle 2023-04-03 14:54:04 +01:00
Mathew May d017cb5d52 MDL-77825 grade_gradereport: MS SQL fix for user search 2023-04-03 20:17:59 +08:00
Mark Johnson bddfd39804 MDL-75301 question: Add behat generator for updating questions
This adds "core_question > updated question" as an entity for `the
following "X" exist` and calls the existing update_question() generator
which will create a new question version with the supplied data.
2023-04-03 12:31:15 +01:00
Sara Arjona 0d8fc7d9b1 Merge branch 'MDL-76800-master' of https://github.com/raortegar/moodle 2023-04-03 12:41:14 +02:00
Paul Holden cea2bf47eb Merge branch 'MDL-77227-master' of https://github.com/aanabit/moodle 2023-04-03 10:56:13 +01:00
Sara Arjona 1f9ed85d71 Merge branch 'MDL-77807' of https://github.com/paulholden/moodle 2023-04-03 11:53:12 +02:00
Michael Hawkins d4cdf52873 MDL-75906 core: Updated security.txt expiry 2023-04-03 17:11:02 +08:00
Sara Arjona c75ff0b0a3 Merge branch 'MDL-77656' of https://github.com/timhunt/moodle 2023-04-03 11:01:34 +02:00
Laurent David 166e04899e MDL-77712 core_course: Fix exception with inplace editor
* On fresh install, an exception is raised when we try to modify
the name of a newly inserted activity in the front page
2023-04-03 10:33:56 +02:00
AMOS bot d61705cf82 Automatically generated installer lang files 2023-04-02 00:07:40 +00:00
AMOS bot be350ecd2a Automatically generated installer lang files 2023-04-01 00:07:51 +00:00
Petr Skoda 176191dab5 MDL-74936 core: tidy up context API 2023-03-31 23:09:39 +02:00
Petr Skoda 728c3c4bd1 MDL-74936 core: namespace all context class 2023-03-31 23:09:39 +02:00
Paul Holden fba0658777 on-demand release 4.2dev+ 2023-03-31 18:13:57 +01:00
Paul Holden af694fea80 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-31 18:13:54 +01:00
Tim Hunt 9efaa719cc MDL-77656 quiz: stop using displayed number as an id 2023-03-31 16:01:23 +01:00
Tim Hunt 3bea326d7a MDL-77656 quiz: Don't use custom question numbers from shuffled sections 2023-03-31 16:01:23 +01:00
Tim Hunt 24bbb18eb2 MDL-77656 quiz editing: customisable numbers only in unshuffled sections
This works by always outputting both the customised and uncustomised
number into the HTML of the Questions page, then uses CSS & JS to
show the appropriate one as shuffle is toggled.
2023-03-31 16:01:23 +01:00
Tim Hunt d7462893b0 MDL-77656 quiz: handling special chars in customised question numbers 2023-03-31 16:01:22 +01:00
Tim Hunt 6df55bf1f3 MDL-77656 quiz: fix web services to handle custom question numbers 2023-03-31 16:01:22 +01:00
Paul Holden 541981fcb9 MDL-74465 blocks: correct upgrade note version number. 2023-03-31 08:46:26 +01:00
raortegar ca2fd15a2a MDL-76800 lib: Adapt dataformat to OpenSpout 4.0 version. 2023-03-31 09:18:14 +02:00
Ilya Tregubov e090ef0b6a Merge branch 'MDL-76143-patch' of https://github.com/ilyatregubov/moodle 2023-03-31 14:33:30 +08:00
Mathew May c48881b5fd MDL-76143 gradereport_grader: Behat changes after integration 2023-03-31 14:32:44 +08:00
Jake Dallimore d4c37fc282 Merge branch 'MDL-59175' of https://github.com/paulholden/moodle 2023-03-31 11:56:14 +08:00
Jake Dallimore 3811982477 Merge branch 'MDL-77794' of https://github.com/paulholden/moodle 2023-03-31 11:48:29 +08:00
Andrew Nicols 64f2e494b9 Merge branch 'MDL-77783-master' of https://github.com/junpataleta/moodle 2023-03-31 11:30:54 +08:00
Jake Dallimore aeb7763a0d Merge branch 'MDL-77033-master-3' of https://github.com/ilyatregubov/moodle 2023-03-31 11:29:45 +08:00
Shamim Rezaie e541732a6a Merge branch 'MDL-74465-master-5' of https://github.com/marinaglancy/moodle 2023-03-31 13:45:15 +11:00
Ilya Tregubov 5b8c1ffd84 Merge branch 'MDL-77406' of https://github.com/AnupamaSarjoshi/moodle 2023-03-31 09:47:23 +08:00
Ilya Tregubov e2f4cf48a5 Merge branch 'MDL-70976-master' of https://github.com/laurentdavid/moodle 2023-03-31 09:41:17 +08:00
AMOS bot fd4a478861 Automatically generated installer lang files 2023-03-31 00:07:44 +00:00
Paul Holden fc2cfd8695 MDL-77807 files: normalise file entity size/type column fields.
The `filename` field was only used by each to determine whether the
file was itself a directory, and it's presence meant that aggregation
of each column wasn't working properly.
2023-03-30 20:40:24 +01:00
Sara Arjona 28953bf23b Merge branch 'MDL-77693-master' of https://github.com/andrewnicols/moodle 2023-03-30 19:00:32 +02:00
Sara Arjona c80dd76bef Merge branch 'MDL-77456-master' of https://github.com/laurentdavid/moodle 2023-03-30 18:42:02 +02:00
Sara Arjona 4c0ce28ade Merge branch 'MDL-77761-master' of https://github.com/junpataleta/moodle 2023-03-30 17:53:13 +02:00
Jun Pataleta 64c1a5c337 Merge branch 'MDL-77306-master' of https://github.com/junpataleta/moodle 2023-03-30 23:38:57 +08:00
Sara Arjona b4cb4ac512 Merge branch 'MDL-77672-master' of https://github.com/ferranrecio/moodle 2023-03-30 17:32:53 +02:00
Jun Pataleta c5c065e10a MDL-77306 core: Remove LIMIT from SQL statement
Adding LIMIT to the primary auth type SQL statement does not play well
with Oracle. We can just remove the LIMIT clause from the SQL statement
and and pass IGNORE_MULTIPLE to the call to $DB->get_field_sql()
instead.
2023-03-30 23:18:27 +08:00
Sara Arjona 09171a3c3a Merge branch 'MDL-77726-master' of https://github.com/jleyva/moodle 2023-03-30 16:56:56 +02:00
Ferran Recio da1aa96664 MDL-77672 core_courseformat: fix bulk in one section per page 2023-03-30 16:42:59 +02:00
Sara Arjona 36f5355865 Merge branch 'MDL-77764' of https://github.com/paulholden/moodle 2023-03-30 16:31:15 +02:00
Paul Holden c59d7f0174 Merge branch 'MDL-77789-master' of https://github.com/sarjona/moodle 2023-03-30 14:32:21 +01:00
Ilya Tregubov 51182b603b MDL-77033 core_grades: Deprecate get icons functions.
We don't use those anymore. There are respective functions to get
link without icon.
2023-03-30 20:20:10 +08:00
Ilya Tregubov 013cf3b741 MDL-77033 core_behat: Fix behat tests. 2023-03-30 20:20:10 +08:00
Ilya Tregubov 11b6dce50c MDL-77033 core_grades: Add status column to setup page
Also make action menu consistent with grader report
2023-03-30 20:20:10 +08:00
Ilya Tregubov 7653093b55 MDL-77033 core_behat: Remove multilang from some scenarios
It should be only tested once. No need to have it in all tests.
Some steps will have to use category fullname so using tags in steps
will look ugly.
2023-03-30 20:20:10 +08:00
Ilya Tregubov 8b4bc3d31a MDL-77033 core_behat: Refactor behat steps to be reusable.
We will need similar step definitions for gradebook setup page.
So moving those from grader plugin to the core.
2023-03-30 20:20:10 +08:00
Ilya Tregubov 9ba802ca0c MDL-77033 cores_grades: Refactor cell menus to be reusable.
We need similar menus on gradebook setup page. So moving from
grader plugin to core
2023-03-30 20:20:10 +08:00
Paul Holden a7f7e0728b Merge branch 'MDL-76481_master_Brickfield_TCPDF_error' of https://github.com/brickfield/moodle 2023-03-30 12:50:07 +01:00
Sara Arjona d94061e03d Merge branch 'MDL-77762' of https://github.com/paulholden/moodle 2023-03-30 13:45:11 +02:00
Marina Glancy 9788496e4a MDL-74465 theme_classic: override new block steps 2023-03-30 12:15:55 +01:00
Marina Glancy a507a9e68a MDL-74465 blocks: changes for backward-compatibility 2023-03-30 12:15:55 +01:00
Marina Glancy 4d768ba508 MDL-74465 block_rss_client: display config when adding 2023-03-30 12:15:54 +01:00
Marina Glancy 2fdfc9c362 MDL-74465 block_glossary_random: display config when adding 2023-03-30 12:15:54 +01:00
Marina Glancy 2909e91877 MDL-74465 block_activity_results: display config when adding 2023-03-30 12:15:54 +01:00
Marina Glancy 04c3cd2343 MDL-74465 block_html: display config when adding 2023-03-30 12:15:54 +01:00
Marina Glancy 6b081d2e9f MDL-74465 blocks: allow configuration in modal
Introduce 'pagehash' - an identifier that uniquely identifies a page for the user session
2023-03-30 12:15:54 +01:00
Marina Glancy 1150b08264 MDL-74465 blocks: move some code into separate functions
This commit has no functional changes, only code refactoring
2023-03-30 12:15:51 +01:00
Jun Pataleta 3aaf813bd2 Merge branch 'MDL-77333' of https://github.com/stronk7/moodle 2023-03-30 19:03:48 +08:00
Sara Arjona afe1f192c4 Merge branch 'MDL-76895-master' of https://github.com/ferranrecio/moodle 2023-03-30 12:51:03 +02:00
Marina Glancy 854dd65966 MDL-74465 blocks: improve phpdocs 2023-03-30 11:41:16 +01:00
Sara Arjona de73be254f MDL-77789 mod_h5pactivity: Only remove the current user state content
When a new attempt is created, the previous state content is removed.
There was a bug which was removing all the content data of a given
activity for all the users (instead of deleting only the content data
for the current user).
2023-03-30 12:32:02 +02:00
Ferran Recio 879dc5f308 MDL-76895 core_courseformat: add detailed bulk selection checks
To prevent future regressions some extra checks has been added to the
bulk_select feature file. The new checks validate the activities and
sections bulk selectors are really selected, not only the total count.
2023-03-30 12:13:24 +02:00
Paul Holden f60057a680 Merge branch 'MDL-77773-master' of https://github.com/andrewnicols/moodle 2023-03-30 10:41:15 +01:00
Ferran Recio 0436605df5 MDL-76895 core_courseformat: add fast bulk selections 2023-03-30 11:40:45 +02:00
Jun Pataleta a5eda30ecf Merge branch 'MDL-77346-master' of https://github.com/meirzamoodle/moodle 2023-03-30 17:31:47 +08:00
Paul Holden 2d820b8f28 MDL-77794 contentbank: fix plugin type language strings.
AMOS BEGIN
 CPY [type_contentbank,core_plugin],[type_contenttype,core_plugin]
 CPY [type_contentbank_plural,core_plugin],[type_contenttype_plural,core_plugin]
AMOS END
2023-03-30 09:50:51 +01:00
Max Larkin b0c5683638 MDL-76481 tool_brickfield: Fix PHP 8 report download 2023-03-30 09:03:36 +01:00
Paul Holden 813800d218 Merge branch 'MDL-75017' of https://github.com/timhunt/moodle 2023-03-30 08:47:52 +01:00
Paul Holden bf3c07834a Merge branch 'MDL-77744-master-2' of https://github.com/ilyatregubov/moodle 2023-03-30 08:34:35 +01:00
Ilya Tregubov 1d919c12c6 Merge branch 'MDL-73771' of https://github.com/lostrogit/moodle 2023-03-30 14:22:32 +08:00
Jun Pataleta ae3e9667c2 MDL-72350 core: Add @covers for test_check_mod_assignment_is_used
Plus, remove getStatus() assertion when running the test with
mod_assignment reinstalled since it check_mod_assignment returns a
null result.
2023-03-30 13:00:39 +08:00
Jun Pataleta 11c2667107 Merge branch 'MDL-72350-master' of https://github.com/stevandoMoodle/moodle 2023-03-30 12:57:20 +08:00
Jun Pataleta 4858a62623 Merge branch 'MDL-76143-class' of https://github.com/Chocolate-lightning/moodle 2023-03-30 12:37:52 +08:00
Andrew Nicols e0acbbc6ea MDL-77693 core: Check the start time of a cron run when fetching tasks
When fetching the list of tasks to run, we were using the _process_
start time as a base. The various task fetchers (adhoc and scheduled)
only fetch tasks which were due to run _before_ this time.

With the new keepalive setting, we need to pass both the process start
time, and the run start time. We need to use the process start time to
determine whether MUC caches have been cleared since the process
started. but the run start time to fetch recent runs.
2023-03-30 11:35:59 +08:00
Mathew May d80fb6ce2c MDL-76143 gradebook: Add search into graderreport 2023-03-30 11:29:01 +08:00
Andrew Nicols 43caf1bee7 Merge branch 'MDL-74664-master' of https://github.com/call-learning/moodle 2023-03-30 11:27:09 +08:00
Jake Dallimore bbe6da6890 Merge branch 'MDL-77347-master' of https://github.com/meirzamoodle/moodle 2023-03-30 10:45:41 +08:00
Sara Arjona 1147a9fe9d MDL-72350 mod: Remove mod_assignment
The Assignment 2.2 activity module was disabled in 2012 but kept to
enable pre-2.2 backups to be restored and have the assignments
auto-converted to new assignments. After almost 10 years, it's time
to remove it from Moodle core.
2023-03-30 09:00:10 +08:00
Stevani Andolo 26d78531e7 MDL-72350 core: Added environment check for mod_assignment
Decided to add an environment check before uninstalling the
mod_assignment plugin to prevent data lost.
2023-03-30 09:00:06 +08:00
Stevani Andolo 7310e99dda MDL-72350 mod: Updated upgrade.txt file 2023-03-30 08:09:13 +08:00
Stevani Andolo 731a62f30f MDL-72350 mod_assign: Removed upgradelib.php from mod_assign
After checking the the relation between mod_assign and mod_assginment,
it was found that upgradelib.php was only used/called from the
mod_assignment. Therefore, it was decided to move the upgradelib.php
from mod_assign to mod_assignment and deleted the line in which requires the upgradelib.php
2023-03-30 08:09:07 +08:00
AMOS bot f4e221887f Automatically generated installer lang files 2023-03-30 00:07:47 +00:00
Amaia Anabitarte fd5db65c0b MDL-77227 roles: Remove extra information for override page 2023-03-29 18:15:46 +02:00
Juan Leyva 7ad5ec2add MDL-76792 course: Remove unnecessary include and checks
This code is very old and does nothing, the proper format validation and fallback is handled by the core_courseformat class.
2023-03-29 17:28:08 +02:00
Juan Leyva b540a59e55 MDL-76792 webservice: Avoid exception when missing component 2023-03-29 17:28:05 +02:00
Laurent David ca2e4603c0 MDL-74664 mod_bigbluebuttonbn: Fix capabilty checking
* role::has_capability_in_course should check if course exist first
2023-03-29 17:16:32 +02:00
Laurent David e635ba840d MDL-74664 mod_bigbluebuttonbn: Restricted recording access fix
* Recording formats should not be accessible to students unless specified as safe
* A global setting will now list all the "safe" formats for students
* A new capability 'mod/bigbluebuttonbn:viewallrecordingsformats' will allow users to
see all formats (as long as they can manage recordings also)
2023-03-29 17:16:32 +02:00
Tim Hunt 47ff5c8e5b MDL-77785 quiz/question: display long question numbers better 2023-03-29 15:04:34 +01:00
Carlos Castillo e882ef7edf MDL-73771 theme: Fix scrollbar position 2023-03-29 09:01:43 -05:00
Paul Holden 4f13fa65ce Merge branch 'MDL-76866-master' of https://github.com/andrewnicols/moodle 2023-03-29 13:36:26 +01:00
Andrew Nicols cd48ee93c3 MDL-76866 repository_contentbank: Mark step as using atto editor 2023-03-29 20:33:47 +08:00
Andrew Nicols faa68960ad MDL-76866 calendar: Make test more specific 2023-03-29 20:33:47 +08:00
Andrew Nicols 198842e4f6 MDL-76866 mod_quiz: Use atto for grading test
This test is using xpaths for Atto specifically and is an Atto-specific
test.

It needs to be rewritten to be editor-agnostic.
2023-03-29 20:33:47 +08:00
Andrew Nicols 035d818dd3 MDL-76866 mod_data: Disable the HTML editor to insert partial HTML
This test is adding table rows into an HTML editor and, quite rightly,
is failing under TinyMCE.

This only worked under Atto because Atto does not perform any HTML
validation. A user would not actually be able to insert the template
content this way, and therefore the test is/was invalid.

This change disables the HTML editor before inserting the template
content, which resembles the actions of a real user.
2023-03-29 20:33:47 +08:00
Andrew Nicols 96fd7a83fb MDL-76866 mod_data: Editors should have data-fieldtype attrib 2023-03-29 20:33:47 +08:00
Andrew Nicols 4782312411 MDL-76866 editor_atto: Remove old install script
This install script has not been required for a number of years because
we require the previous LTS for an LTS+1 upgrade. Once Atto was
part of core after an LTS release, it was safe to remove this file.

This is now preventing Tiny from becoming default for new installs in
some situations.
2023-03-29 20:33:47 +08:00
Andrew Nicols 2583805c68 MDL-76866 editor_tiny: make tiny default editor 2023-03-29 20:33:47 +08:00
raortegar 3ddfaebd43 MDL-76800 lib: upgrade OpenSpout to 4.0 2023-03-29 11:34:19 +02:00
Ilya Tregubov b6a5a0bcc2 MDL-77744 core_grades: Use separate attribute for gradeitems/users. 2023-03-29 17:24:55 +08:00
Paul Holden e4317c27b2 Merge branch 'MDL-77339-master' of https://github.com/meirzamoodle/moodle 2023-03-29 10:21:08 +01:00
Paul Holden 2e7cf5a9be Merge branch 'MDL-77701-master' of https://github.com/dpalou/moodle 2023-03-29 10:04:40 +01:00
Jun Pataleta acb6846bfa Merge branch 'MDL-77774' of https://github.com/paulholden/moodle 2023-03-29 16:55:41 +08:00
Sara Arjona 4bb8de0c6e Merge branch 'MDL-77677-master' of https://github.com/ferranrecio/moodle 2023-03-29 10:33:07 +02:00
Laurent David 0ff7295ee4 MDL-77456 core_courseformat: Fix highlight in course index
* When navigating to a restricted activity as a student from the course index
the item is not highlighted when refreshing the page.
2023-03-29 09:13:54 +02:00
Laurent David 4281b6e859 MDL-70976 core_files: Allow for draft files url inserted in content
* The file file_remove_editor_orphaned_files should take into account URL that
have been embedded in a tag content instead of an attribute (like src attribute)
* This will fix issue with inserting H5P content in calendar events.
2023-03-29 09:09:56 +02:00
Ilya Tregubov 499894532d Merge branch 'MDL-77748' of https://github.com/skodak/moodle 2023-03-29 14:12:41 +08:00
Shamim Rezaie a0b134107c Merge branch 'MDL-74452_master' of https://github.com/marxjohnson/moodle 2023-03-29 15:26:49 +11:00
Matt Porritt 4c76cc46f8 MDL-77306 Site Registration: add extra statistics
Add the DB type, count of courses with start or end dates set,
default site theme, and primary auth type statistics to those
collected as part of the site registration data.
2023-03-29 15:22:28 +11:00
Stevani Andolo 9266ae8f4a MDL-72350 mod_assignment: Removed all mod_assignment files 2023-03-29 11:47:43 +08:00
Jun Pataleta 904567404b Merge branch 'MDL-77767-master' of https://github.com/jleyva/moodle 2023-03-29 11:17:10 +08:00
Ilya Tregubov e328cc54ae Merge branch 'MDL-77740-master' of https://github.com/andrewnicols/moodle 2023-03-29 10:57:35 +08:00
Jun Pataleta 476f162812 Merge branch 'MDL-77382-master' of https://github.com/snake/moodle 2023-03-29 09:48:38 +08:00
Jun Pataleta 7695b4b18c Merge branch 'MDL-77119' of https://github.com/paulholden/moodle 2023-03-29 09:46:31 +08:00
Jun Pataleta e174f3e0d5 Merge branch 'MDL-76941-master-2' of https://github.com/HuongNV13/moodle 2023-03-29 09:31:58 +08:00
Jun Pataleta e95e290532 MDL-77783 core: Validate sublugins.json
* Validate the decoded subplugins.json before processing it.
* Log errors if subplugins.json is invalid or if plugintypes is not
defined.
2023-03-29 09:29:36 +08:00
Jun Pataleta 8e8a8c1a60 MDL-77761 core_form: Add label for editor format selector 2023-03-29 07:59:39 +08:00
Stephan Robotta b86719f9d0 MDL-77385 cli: CLI script to modify emailstop flag for users 2023-03-28 20:23:23 +02:00
Paul Holden 107b21db16 MDL-77774 gradereport_grader: correct/cleanup previous upgrade step.
Using incorrect data in the upgrade step from ca60efb8 created a
phantom plugin entry.
2023-03-28 18:42:51 +01:00
Eloy Lafuente (stronk7) 6612eab5a4 MDL-77333 mod_resource: fixes generator uploading files + tests
MDL-76499 revealed a few problems with resource generators:

1. We were not covering with unit tests the upload of files from disk
   (and here it's where the problem was).
2. There was a little of confusion between disk paths (only needed
   to upload files) and file_area paths (the generator only creates
   or uploads files to the root directory of the file area.
3. It was possible to request the upload of a file to the generator
   without that file effectively existing.

This commit fixes those points  and covers 99% of the generator code.
2023-03-28 19:06:09 +02:00
Anupama Sarjoshi 23aab0eebf MDL-77406 core: Fix code checker issues 2023-03-28 17:50:03 +01:00
Anupama Sarjoshi 42f4b0a991 MDL-77406 core: Logs to record user file uploaded in draft area 2023-03-28 17:49:54 +01:00
Paul Holden f7a8df253b on-demand release 4.2dev+ 2023-03-28 15:55:49 +01:00
Paul Holden bec19cf3f7 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-28 15:55:46 +01:00
Andrew Nicols 7ba9097264 MDL-77773 editor_tiny: Improve initial editor size 2023-03-28 20:47:49 +08:00
Paul Holden 59e69a939e Merge branch 'MDL-77105-master-4' of https://github.com/junpataleta/moodle 2023-03-28 12:38:39 +01:00
Jun Pataleta 064971648c MDL-77105 core: Cast custom data to an array when evaluating filtericon
Since other modules may treat custom data as an object, we need to make
cast it to an array before evaluating for the `filtericon` custom data.
2023-03-28 18:48:31 +08:00
Mark Johnson ace34e2bb2 MDL-74452 quiz: Fix reopen_open_attempt_test 2023-03-28 11:42:44 +01:00
Mark Johnson 72e7818467 MDL-74452 quiz: Display an error if all versions are in draft status 2023-03-28 11:42:44 +01:00
Juan Leyva fe2f96762a MDL-77767 question: Fix PHP warning in ddimageortext 2023-03-28 11:39:17 +02:00
Ferran Recio f52d4fcb82 MDL-77677 core_courseformat: debounce reload cm method 2023-03-28 09:48:51 +02:00
Dani Palou 349774a9f3 MDL-77701 mod_h5pactivity: Return admin settings in by_courses WS 2023-03-28 08:00:48 +02:00
Huong Nguyen dfaf14fb18 MDL-76941 tool_usertours: Fix accessibility issue when resizing 2023-03-28 12:17:39 +07:00
Andrew Nicols ad15209e1f Merge branch 'MDL-77029-master' of https://github.com/ilyatregubov/moodle 2023-03-28 12:37:01 +08:00
Jake Dallimore 1d25d477d6 Merge branch 'MDL-76149-master' of https://github.com/rezaies/moodle 2023-03-28 12:07:32 +08:00
Jake Dallimore efac6d72cf Merge branch 'MDL-77105-master-4' of https://github.com/junpataleta/moodle 2023-03-28 11:42:29 +08:00
Ilya Tregubov cb00d26105 MDL-77029 gradereport_grader: Fix sorting bug
When column was sorted in descending order, null values
were shown first.
2023-03-28 11:22:45 +08:00
Ilya Tregubov fc9583bae1 MDL-77029 gradereport_grader: Add sorting to grade item columns 2023-03-28 11:22:42 +08:00
Andrew Nicols 8fe80e743c MDL-77740 editor_tiny: Set the Editor window from the iFrame element
This is a workaround for an upstream bug which I have not been able to
reproduce outside of Moodle whereby the editor.contentWindow does not
match the editor.iframeElement.contentWindow when it should.

This issue only seems to affect Firefox, and it may even be a bug in
Firefox. It can only be reproduced when using a fresh browser which has
never had a TinyMCE window open.
2023-03-28 10:43:21 +08:00
Jun Pataleta d4d13a5a94 Merge branch 'MDL-77342-master' of https://github.com/meirzamoodle/moodle 2023-03-28 09:54:50 +08:00
Jun Pataleta 860f85e8b8 Merge branch 'MDL-77670-master' of https://github.com/juancs/moodle 2023-03-28 07:04:23 +08:00
Paul Holden fd3180c5d3 MDL-77762 contentbank: always provide exit button when appropriate.
If the current user can access the content bank in the context of the
current item, then provide link back to it.
2023-03-27 18:08:55 +01:00
Meirza ab2f3f1bda MDL-77339 grade: Added class properties that are not declared
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 22:53:04 +07:00
Paul Holden 5ed9c1da14 MDL-77764 contentbank: add field label to context selection element. 2023-03-27 16:51:52 +01:00
Meirza 98c55a725e MDL-77346 mod_workshop: Added missing class properties
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 21:59:39 +07:00
Sara Arjona 7c2cacaaf0 Merge branch 'MDL-76376' of https://github.com/jrchamp/moodle 2023-03-27 16:56:22 +02:00
Sara Arjona 1a01afbcb3 Merge branch 'MDL-77659' of https://github.com/AnupamaSarjoshi/moodle 2023-03-27 16:50:25 +02:00
Sara Arjona cc853bf064 Merge branch 'MDL-73226-master' of https://github.com/jleyva/moodle 2023-03-27 16:08:19 +02:00
Juan Leyva fc97f32010 MDL-73226 files: Add quota checks to core_user_add_user_private_files 2023-03-27 13:11:46 +02:00
Sara Arjona e4663dc82f Merge branch 'MDL-76303-master' of https://github.com/ssj365/moodle 2023-03-27 12:39:44 +02:00
Paul Holden 696ae3bc3a Merge branch 'MDL-77729' of https://github.com/timhunt/moodle 2023-03-27 11:09:24 +01:00
Paul Holden 1e22628003 Merge branch 'MDL-77734-master' of https://github.com/ferranrecio/moodle 2023-03-27 10:45:10 +01:00
Sara Arjona c2793cf824 Merge branch 'MDL-77561-master' of https://github.com/lameze/moodle 2023-03-27 11:43:19 +02:00
Paul Holden 4146329063 MDL-77555 reportbuilder: method to ensure unique parameters in SQL. 2023-03-27 10:29:25 +01:00
Ferran Recio 5cdb09d10c MDL-77734 core_courseformat: add title to bulk duplicate activities 2023-03-27 11:17:55 +02:00
Meirza a36fcf48a9 MDL-77347 files: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 15:58:22 +07:00
Meirza 7466712fc2 MDL-77347 mod_feedback: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 15:58:17 +07:00
Meirza ace998b8eb MDL-77347 mod_survey: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 15:58:12 +07:00
Meirza f34a1296b5 MDL-77347 mod_bigbluebuttonbn: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 15:58:06 +07:00
Meirza caddf4dd1d MDL-77347 mod_chat: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-27 15:58:01 +07:00
Jun Pataleta 3ecaf6362b MDL-77105 core: Add upgrade.txt notes 2023-03-27 13:58:24 +08:00
Jun Pataleta 6077aae181 MDL-77105 mod_url: Declare filtericon custom data
* Set a custom data `filtericon` when the icon being rendered for the
URL resource is not equal to the default plugin icon.
2023-03-27 13:58:23 +08:00
Jun Pataleta f10d132bdc MDL-77105 mod_lti: Add 'nofilter' class for custom tool icons
Add a '.nofilter' class when rendering custom tool icons in order
to render them as is and without CSS filter on the activity chooser.
2023-03-27 13:57:07 +08:00
Jun Pataleta cd4cebdaef MDL-77105 core_course: Add 'nofilter' class for non-monologo icons
When rendering content items, check whether the plugin has monologo
icons. If so, add a 'nofilter' class so the plugin icon can be
rendered as is and without the CSS filter.
2023-03-27 13:56:15 +08:00
Jun Pataleta 97215704d3 MDL-77105 block_timeline: Add 'nofilter' class when necessary
Add the `.nofilter` class for activity icons when the icon URL's
`filtericon` parameter is not set, so they get rendered as they are on
the timeline block.
2023-03-27 13:54:36 +08:00
Jun Pataleta b78978dac6 MDL-77105 block_recentlyaccesseditems: Add 'nofilter' class
Add the `.nofilter` class for activity icons when the icon URL's
`filtericon` parameter is not set, so they get rendered as they are on
the recently accessed items block.
2023-03-27 13:53:56 +08:00
Jun Pataleta cf09a7f253 MDL-77105 theme_boost: Add 'nofilter' class when necessary
Add the `.nofilter` class for activity icons when the icon URL's
`filtericon` parameter is not set, so they get rendered as they are on
the context header on the activity page.
2023-03-27 13:32:09 +08:00
Jun Pataleta 95d0e30eff MDL-77105 course_format: Add 'nofilter' class when necessary
Add the `.nofilter` class for activity icons when the icon URL's
`filtericon` parameter is not set, so they get rendered as they are on
the course homepage.
2023-03-27 13:32:09 +08:00
Jun Pataleta 2ce59aa924 MDL-77105 core: Conditionally apply icon filter
* Apply the filter CSS property only to activity icons
that don't have the ".nofilter" class. This will allow
activities with non-SVG icons to be rendered as they are.
2023-03-27 13:32:09 +08:00
Jun Pataleta a898d8ac54 MDL-77105 core: Add a filtericon parameter to course mod icon URLs
* If a plugin defines a `filtericon` custom data or uses its monologo
version of the icon, a `filtericon` parameter is being added to the
icon's URL. This information can help plugins determine whether to
render the activity icon as is or with CSS filtering.
2023-03-27 13:32:09 +08:00
Jun Pataleta cd0afd5c76 MDL-77105 core: Method to determine whether a plugin has monolog icons 2023-03-27 13:32:09 +08:00
Shamim Rezaie ce20ad194e MDL-76149 gradereport_grader: Remove studentsperpage config 2023-03-27 04:50:42 +11:00
Shamim Rezaie 14eefae721 MDL-76149 form: Change checker to respect .ignoredirty for active node 2023-03-27 04:47:49 +11:00
Shamim Rezaie d6f26ec49d MDL-76149 gradereport_grader: show perpage dropdown 2023-03-27 04:47:49 +11:00
Shamim Rezaie b7e66fc444 MDL-76149 gradereport_grader: Adding a sticky footer
The pagination bar and the save button are now displayed on the sticky
footer
2023-03-27 04:47:49 +11:00
Petr Skoda f4f106a1c2 MDL-77748 grunt: fix Windows compatibility 2023-03-26 13:33:05 +02:00
Meirza 59c6b2dccd MDL-77342 repository: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-26 14:48:29 +07:00
AMOS bot 975c2531b9 Automatically generated installer lang files 2023-03-26 00:07:45 +00:00
Tim Hunt a5fc60a997 MDL-77729 qformat_missingword: fix form of help link 2023-03-25 15:38:38 +00:00
Sara Arjona 09fd61415e on-demand release 4.2dev+ 2023-03-24 14:00:13 +01:00
Tim Hunt 94a584bf38 MDL-75017 questions: give a clear error if the context type is invalid 2023-03-24 12:59:22 +00:00
Tim Hunt 2e1fde188e MDL-75017 questions: fix weird setup in qformat_xml_import_export_test 2023-03-24 12:56:14 +00:00
Andrew Nicols eafe74bb2d Merge branch 'MDL-75334-master' of https://github.com/call-learning/moodle 2023-03-24 10:49:26 +08:00
Jun Pataleta 67ad18ce07 Merge branch 'MDL-77626' of https://github.com/timhunt/moodle 2023-03-24 10:40:47 +08:00
Andrew Nicols dc52959313 Merge branch 'MDL-76520-master' of https://github.com/HuongNV13/moodle 2023-03-24 09:34:38 +08:00
Jun Pataleta 40a59bccff Merge branch 'MDL-76147-master-2' of https://github.com/ilyatregubov/moodle 2023-03-24 09:32:40 +08:00
Ilya Tregubov fd2b6f5ca9 MDL-76147 gradereport_grader: Fix collapsing preferences.
At certain cases I didn't see a tick in view mode. For example
when I click grades only and then switch to totals only a tick
next to total only was not shown. I think this is caused since before
mode was changed in circlurar order i.e.
fullmode->grade only->aggregate only->fullmode. But now any order is
possible so we need to respect it
2023-03-24 09:26:45 +08:00
Ilya Tregubov ca60efb89f MDL-76147 gradereport_grader: remove deprecated preferences. 2023-03-24 09:26:45 +08:00
Ilya Tregubov f70f2760e8 MDL-76147 grader_report: Fix action menus being covered.
First column and Averages row are sticky. So menu are
covered those.
2023-03-24 09:26:45 +08:00
Ilya Tregubov d2fe7362af MDL-76147 gradereport_grader: Remove show calculation setting. 2023-03-24 09:26:45 +08:00
Ilya Tregubov de32a9e57d MDL-76147 gradereport_grader: Fix Behat tests. 2023-03-24 09:26:45 +08:00
Ilya Tregubov ae79f856e2 MDL-76147 gradereport_grader: Remove show activity icons setting.
We we always show those. Was enabled by default.
2023-03-24 09:26:45 +08:00
Ilya Tregubov 7656f5b6b0 MDL-76147 gradereport_grader: Move grade items and categories icons to action menu. 2023-03-24 09:26:45 +08:00
Ilya Tregubov 1c9d0e57b1 MDL-76147 gradereport_grader: Code style fixes. 2023-03-24 09:26:45 +08:00
Ilya Tregubov 9af798e684 Merge branch 'MDL-76932-master' of https://github.com/meirzamoodle/moodle 2023-03-24 09:16:34 +08:00
Simey Lameze b15d88b811 MDL-77561 behat: add step to accept dpa and enable bigbluebutton
The step i_enable_plugin cannot be used as bigbluebuttonbn_default_dpa_accepted
setting needs to be enable in order for the BigBlueButton plugin to be enabled.
2023-03-24 08:14:37 +08:00
Sara Arjona 6bcb807d15 Merge branch 'MDL-76360-master' of https://github.com/laurentdavid/moodle 2023-03-23 18:33:49 +01:00
Sara Arjona 8975155060 Merge branch 'MDL-77705' of https://github.com/paulholden/moodle 2023-03-23 18:30:21 +01:00
Juan Leyva 76807203a3 MDL-77726 user: Fix custom user profiles supporting filtering in WS 2023-03-23 18:08:03 +01:00
Paul Holden 2aeaa9e4b3 Merge branch 'MDL-77714' of https://github.com/stronk7/moodle 2023-03-23 17:00:09 +00:00
Sara Arjona 70bcda2ef8 Merge branch 'MDL-77666' of https://github.com/paulholden/moodle 2023-03-23 17:53:38 +01:00
Sara Arjona 5ccb47ef47 Merge branch 'MDL-76246-master' of https://github.com/rezaies/moodle 2023-03-23 17:27:33 +01:00
Shamim Rezaie 3d16a7f453 MDL-76246 core_grades: Add aria-label to the group combobox
Also replaced str with cleanstr for aria-labels
2023-03-24 03:20:44 +11:00
Sara Arjona 9ec55f3091 Merge branch 'MDL-77721-master' of https://github.com/lameze/moodle 2023-03-23 16:17:51 +01:00
Shamiso.Jaravaza dca1c7994f MDL-76303 mod_bigbluebuttonbn: Fix userlimit 2023-03-23 08:26:51 -06:00
Paul Holden ee8290f231 Merge branch 'MDL-77392-master' of https://github.com/srobotta/moodle 2023-03-23 12:25:27 +00:00
Paul Holden cd5b9b97d9 Merge branch 'MDL-77691' of https://github.com/roland04/moodle 2023-03-23 11:43:39 +00:00
Stephan Robotta 06872a4ebd MDL-77392 calendar: calendar items are hidden because of settings 2023-03-23 12:39:15 +01:00
Paul Holden 6c3207ff8f Merge branch 'MDL-73708-master' of https://github.com/rmady/moodle 2023-03-23 11:10:53 +00:00
Laurent David 76e3c30465 MDL-76360 mod_data: Field page layout improvement
* Unify the fields_action_bar and action_bar template
* Make sure the Create a field button is a primary button
* The fields_action_bar is very similar to the action_bar template so
should be used instead
2023-03-23 12:02:14 +01:00
Huong Nguyen 359efecb03 MDL-76520 tiny_link: Add a TinyMCE link plugin
Co-authored-by: Andrew Lyons <andrew@nicols.co.uk>
2023-03-23 15:50:44 +07:00
Simey Lameze 61f4843fed MDL-77721 navigation: Revert the patch for MDL-75908.
This reverts commit 7b8fa9de86.
2023-03-23 15:45:11 +08:00
Jake Dallimore dc63f52538 Merge branch 'MDL-76246-master' of https://github.com/rezaies/moodle 2023-03-23 10:17:06 +08:00
Juan Leyva 27be439eb7 MDL-73708 course: Return geo pattern generated course images via WS 2023-03-22 17:39:07 -03:00
Eloy Lafuente (stronk7) 3faf1c1989 MDL-77714 general: Remove mentions to Travis CI in a few places
Not critical to have, but better don't mention it. Note that all
the cases need to stay because there may be other environments
where the same problems are reproducible.

Only exception is the CURL_SSLVERSION_TLSv1_2 constant, that
can be safely removed because it's available since PHP 5.5.19.
2023-03-22 19:17:14 +01:00
Eloy Lafuente (stronk7) 9a344c8967 MDL-77714 general: Remove Travis CI integration from core
Agreed @ MDLSITE-7135, this completely removes the Travis CI
integration with a note in the lib/upgrade.txt file, pointing
to the currently supported GHA alternative.
2023-03-22 19:04:54 +01:00
Paul Holden 3e0edcdb18 MDL-76551 mod_bigbluebuttonbn: correct stdClass method parameter type. 2023-03-22 17:15:16 +00:00
Paul Holden 0444b91148 Merge branch 'MDL-76551-master' of https://github.com/call-learning/moodle 2023-03-22 17:08:04 +00:00
Laurent David 7af38677b6 MDL-75334 mod_bigbluebuttonbn: Generate course with BigblueButtonBN
* Use a new generator to create a course full of BigblueButton Activities
in order to check for performances with a lot of activities
2023-03-22 17:28:26 +01:00
Sara Arjona ee3502dfc4 Merge branch 'MDL-76905-master' of https://github.com/ferranrecio/moodle 2023-03-22 16:52:47 +01:00
Laurent David aa9c5cf455 MDL-76551 mod_bigbluebuttonbn: Add user picture
* Add user picture with token
* Add a new global setting to enable or disable avatar for users in meeting.
2023-03-22 15:42:28 +01:00
Laurent David ba81f720db MDL-76551 mod_bigbluebuttonbn: Refactor join url
* get_join url should not have as many parameters as they can be deduced from the instance.
* Refactoring it will allow to pass on more implicit parameters like the user profile file.
2023-03-22 15:07:23 +01:00
Paul Holden 2a8228e410 Merge branch 'MDL-77049-master' of https://github.com/sarjona/moodle 2023-03-22 13:39:34 +00:00
Ferran Recio ae799fad7d MDL-76905 core_courseformat: match prototype visual style 2023-03-22 14:08:51 +01:00
Sara Arjona c03b9a47cf Merge branch 'MDL-77380-master' of https://github.com/lameze/moodle 2023-03-22 14:06:01 +01:00
Sara Arjona 465be9348b Merge branch 'MDL-77433-master' of https://github.com/ferranrecio/moodle 2023-03-22 13:53:32 +01:00
Sara Arjona d04f42492c Merge branch 'MDL-77692' of https://github.com/paulholden/moodle 2023-03-22 13:50:06 +01:00
Paul Holden 054a6fa9b4 Merge branch 'MDL-77643-master' of https://github.com/jleyva/moodle 2023-03-22 12:38:02 +00:00
Ferran Recio a1ea81eb8b MDL-77433 core_courseformat: use validate_cms to check capabilities 2023-03-22 13:21:05 +01:00
Sara Arjona 91175a6773 MDL-77049 core_h5p: Use the styles from Raw SCSS theme settings
MDL-69087 added an option to let themes personalize the H5P styles.
This patch implements the h5p_alter_styles() method in boost, to
let admins personalize the H5P styles using the 'Raw initial SCSS'
and 'Raw SCSS' theme settings.
That way, users won't need to create their own themes to define
some styles for the H5P player.
2023-03-22 12:10:57 +01:00
Shamim Rezaie 5c9142eee4 MDL-76246 contentbank: fix behat failure 2023-03-22 20:59:14 +11:00
Shamim Rezaie 02471ef1cd MDL-76246 core_grades: Remove url param from ws 2023-03-22 20:59:14 +11:00
Shamim Rezaie 1a01607463 MDL-76246 core_grades: Improve user search styling
Show profile image, and display email in a separate line
2023-03-22 20:59:14 +11:00
Shamim Rezaie d2881df06b MDL-76246 core_grades: Group search widget to combobox 2023-03-22 20:59:14 +11:00
Shamim Rezaie 343e676c4b MDL-76246 gradereport_singleview: Grade item search widget to combobox 2023-03-22 20:59:14 +11:00
Shamim Rezaie d856c48639 MDL-76246 gradereport_singleview: Make the user search widget a combobox 2023-03-22 20:59:14 +11:00
Shamim Rezaie 3db5625fc9 MDL-76246 gradereport_user: Make the user search widget a combobox
Use <div> instead of <button> because <button> cannot have <div>
children.
2023-03-22 20:59:14 +11:00
Shamim Rezaie c4f33ceb59 MDL-76246 output: combobox support improvements
- It was a mistake to assume the listbox is always within
   combobox.parentElement
 - Take into account that the popup of the combobox is not necessarily a
   listbox
 - Update combobox fix so that it also work with comboboxes that are not
   select-menu
 - Update combobox fix so that it also support editable comboboxes
 - Update click listener to take into account that the event's target
   might be one of the option element
 - Having a hidden input element for comboboxes was not an ARIA
   requirement and was added by us. I added data-input-element to the
   combobox element to specify the input element related to it.
2023-03-22 20:59:14 +11:00
Jun Pataleta 775872450c Merge branch 'MDL-77673-master' of https://github.com/jleyva/moodle 2023-03-22 17:12:29 +08:00
Ilya Tregubov e11ec0caed Merge branch 'MDL-77032-master-1' of https://github.com/mihailges/moodle 2023-03-22 13:36:05 +08:00
Ilya Tregubov 794f107e88 on-demand release 4.2dev+ 2023-03-22 09:37:45 +08:00
Ilya Tregubov ccc424affa Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-22 09:37:43 +08:00
Paul Holden d834accd90 MDL-77705 reportbuilder: avoid re-using field alias between entities.
Ensure that when the user entity is added multiple times to a report,
when there are custom profile fields, each of those gets a unique table
alias per-entity.
2023-03-21 16:43:00 +00:00
Jun Pataleta 3be6f5c941 Merge branch 'MDL-75746_master' of https://github.com/marxjohnson/moodle 2023-03-21 15:48:03 +01:00
Jake Dallimore d001dd43ca Merge branch 'MDL-70687_default-redis-session-lock-expiration-to-php-execution-time' of https://github.com/ziegenberg/moodle 2023-03-21 15:48:03 +01:00
Jun Pataleta 869cfac1cc Merge branch 'MDL-69124' of https://github.com/paulholden/moodle 2023-03-21 15:48:01 +01:00
Jun Pataleta 6baff9e550 Merge branch 'MDL-77541' of https://github.com/paulholden/moodle 2023-03-21 15:46:29 +01:00
Jun Pataleta 930bd50758 Merge branch 'MDL-77607' of https://github.com/stronk7/moodle 2023-03-21 15:46:29 +01:00
Ilya Tregubov 1ac2e6ecca Merge branch 'mdl-72533-event-table-performance' of https://github.com/petersistrom/moodle 2023-03-21 15:46:28 +01:00
Paul Holden 1eb6c49fa3 Merge branch 'MDL-72124_master' of https://github.com/marxjohnson/moodle 2023-03-21 15:46:28 +01:00
Sara Arjona 494060a4a5 Merge branch 'MDL-77574-master' of https://github.com/lameze/moodle 2023-03-21 15:46:28 +01:00
Sara Arjona 3b68a32832 Merge branch 'MDL-73670-master' of https://github.com/jleyva/moodle 2023-03-21 15:46:28 +01:00
Sara Arjona 2e334cf58c Merge branch 'MDL-77523-master' of https://github.com/juancs/moodle 2023-03-21 15:46:27 +01:00
Sara Arjona d2b0c53db4 Merge branch 'MDL-76893-master' of https://github.com/ferranrecio/moodle 2023-03-21 15:46:27 +01:00
Paul Holden 718108c52f Merge branch 'MDL-77178-master' of https://github.com/aanabit/moodle 2023-03-21 15:46:23 +01:00
Ferran Recio 3beffbb506 MDL-76893 core_courseformat: bulk move activites 2023-03-21 15:46:23 +01:00
Sara Arjona 89cb8b4ee5 Merge branch 'MDL-76918' of https://github.com/paulholden/moodle 2023-03-21 15:46:23 +01:00
Paul Holden 868215311b Merge branch 'MDL-76926-master' of https://github.com/snake/moodle 2023-03-21 15:46:23 +01:00
Tim Hunt 8489808536 MDL-77673 ddimageortext: keep JS data just for the mobile app 2023-03-21 10:13:24 +01:00
Simey Lameze 57e9fec4c8 MDL-77380 block_myoverview: improve show toggle functionality test 2023-03-21 14:43:30 +08:00
Angelia Dela Cruz 374b6d8e0e MDL-77577 Behat: Replaced the use of "Install selected language pack(s)
Evaluated usage of "Install selected language pack(s)" in Behat and
replaced the steps to use generator to install language packs as part
of test setup.
2023-03-21 11:58:30 +08:00
Paul Holden a2a2ea51aa MDL-77692 reportbuilder: format custom field condition/filter names. 2023-03-20 16:09:25 +00:00
Paul Holden f17ba9deb2 MDL-77119 group: custom report elements for group visibility data.
Allow for the reporting of group visibility/participation properties
introduced in 958da5b6, by implementing new entity columns & filters.
2023-03-20 15:44:57 +00:00
Juan Leyva bba614a5eb MDL-77643 tool_mobile: Return location settings 2023-03-20 16:38:44 +01:00
Mikel Martín 9191edb72f MDL-77691 behat: Add step to navigate to profile page directly 2023-03-20 14:18:33 +01:00
Anupama Sarjoshi 79370e225e MDL-77659 core_reportbuilder: fix user profile fields phpunit tests 2023-03-20 12:19:57 +00:00
Amaia Anabitarte d535182414 MDL-77178 report: Update reports tertiary navigation 2023-03-20 11:13:55 +01:00
Paul Holden 060e47e58e MDL-69976 mod_lti: final removal of deprecated 310 method. 2023-03-20 09:41:15 +00:00
Jun Pataleta 109d902105 Merge branch 'MDL-76894-master' of https://github.com/ferranrecio/moodle 2023-03-20 10:43:04 +08:00
Jun Pataleta 12237e6a8c Merge branch 'MDL-76851-master' of https://github.com/ferranrecio/moodle 2023-03-20 10:39:31 +08:00
Jun Pataleta 385f059edc Merge branch 'MDL-76997-master' of https://github.com/aanabit/moodle 2023-03-20 10:32:35 +08:00
Mark Sharp 4e99fe48bc MDL-72533 core_calendar: improve calendar event table peformance
- Filter searchable courses if set.
- Sites with large groups should now experience better performance.
- Applies and optimises query against a proper date range.

Co-authored-by: Mark Sharp <mark.sharp@solent.ac.uk>
Co-authored-by: Peter Sistrom <petersistrom@catalyst-au.net>
Co-authored-by: Kevin Pham <keevan.pham@gmail.com>
2023-03-20 12:15:14 +11:00
AMOS bot 2ec5eb507b Automatically generated installer lang files 2023-03-20 00:07:44 +00:00
Brendan Heywood 2e8bb2cced MDL-77618 admin: Passwords should not auto complete 2023-03-18 12:58:08 +11:00
AMOS bot 0f11994872 Automatically generated installer lang files 2023-03-18 00:07:47 +00:00
Juan Segarra Montesinos adb63ac50e MDL-77670 course: Preserve course summary format 2023-03-17 20:56:26 +01:00
Eloy Lafuente (stronk7) ef936717ee MDL-77607 core_component: Fix wrong component for the grade api
The correct component (subsystem) for the "grade" API is
"core_grades" not "core_grade".

Let's fix that and cover it with tests.
2023-03-17 19:27:14 +01:00
Sara Arjona f3bf17cdfb on-demand release 4.2dev+ 2023-03-17 17:59:32 +01:00
Sara Arjona d2bb0ffd42 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-17 17:59:15 +01:00
Ferran Recio 6ac6100f1c MDL-76894 core_courseformat: bulk move section 2023-03-17 16:18:19 +01:00
Mihail Geshoski 4d7900a391 MDL-77032 grade: Collapsible grade categories in Gradebook setup 2023-03-17 23:04:41 +08:00
Sara Arjona 3acf967276 MDL-77608 h5p: Fix after rewrite
Minor changes, like removing extra line at the end of the file or adding
comment in lib/db/upgrade.php.
2023-03-17 13:20:41 +01:00
Jun Pataleta 4bc059c6cc Merge branch 'master_MDL-76906' of https://github.com/mattporritt/moodle 2023-03-17 13:10:13 +01:00
Jun Pataleta 6dbe4b6839 Merge branch 'MDL-76910' of https://github.com/paulholden/moodle 2023-03-17 13:10:13 +01:00
Jun Pataleta 52d8364819 Merge branch 'MDL-76257-master' of https://github.com/juancs/moodle 2023-03-17 13:10:13 +01:00
Jun Pataleta 16dc3230f5 Merge branch 'MDL-77608' of https://github.com/paulholden/moodle 2023-03-17 13:10:11 +01:00
Ilya Tregubov 9caa246c2b Merge branch 'MDL-76915-master' of https://github.com/meirzamoodle/moodle 2023-03-17 13:04:35 +01:00
Ilya Tregubov cc35edd595 Merge branch 'MDL-76914-master' of https://github.com/meirzamoodle/moodle 2023-03-17 13:04:35 +01:00
Ilya Tregubov b043c16659 Merge branch 'MDL-76911-master' of https://github.com/HuongNV13/moodle 2023-03-17 13:04:35 +01:00
Ilya Tregubov f4891b1034 Merge branch 'MDL-69882' of https://github.com/paulholden/moodle 2023-03-17 13:04:33 +01:00
Paul Holden d81bbc0933 Merge branch 'MDL-76920-master' of https://github.com/cescobedo/moodle 2023-03-17 13:03:32 +01:00
Sara Arjona 5c0e75de4b Merge branch 'master_MDL-76916' of https://github.com/mattporritt/moodle 2023-03-17 13:03:32 +01:00
Sara Arjona a15d363453 Merge branch 'MDL-77275-master' of https://github.com/laurentdavid/moodle 2023-03-17 13:03:31 +01:00
Sara Arjona 6ebfc73e55 Merge branch 'master_MDL-76923' of https://github.com/mattporritt/moodle 2023-03-17 13:03:31 +01:00
Sara Arjona adc7bd5103 Merge branch 'MDL-67526_final-deprecation-of-plagiarism-functions' of https://github.com/ziegenberg/moodle 2023-03-17 13:03:31 +01:00
Paul Holden 66d1d50e92 Merge branch 'MDL-76989-master' of https://github.com/sarjona/moodle 2023-03-17 13:03:30 +01:00
Paul Holden 95c5001ddb Merge branch 'MDL-75464-master' of https://github.com/meirzamoodle/moodle 2023-03-17 13:03:30 +01:00
Paul Holden 6c1777a273 Merge branch 'MDL-76921-master' of https://github.com/cescobedo/moodle 2023-03-17 13:03:30 +01:00
Paul Holden 49e8e72196 Merge branch 'MDL-77337-master' of https://github.com/meirzamoodle/moodle 2023-03-17 13:03:30 +01:00
Jun Pataleta ac0f2ddfd9 Merge branch 'MDL-77604-master' of https://github.com/meirzamoodle/moodle 2023-03-17 13:03:30 +01:00
Jake Dallimore 1546c4ff88 Merge branch 'MDL-76309-master' of https://github.com/sh-csg/moodle 2023-03-17 13:03:29 +01:00
Andrew Nicols 7db7cde55a Merge branch 'MDL-75908-master' of https://github.com/srobotta/moodle 2023-03-17 13:03:29 +01:00
Ilya Tregubov 02009d366e Merge branch 'master_MDL-76909' of https://github.com/mattporritt/moodle 2023-03-17 13:03:29 +01:00
Ilya Tregubov 6ff1017fed Merge branch 'master_MDL-76924' of https://github.com/mattporritt/moodle 2023-03-17 13:03:29 +01:00
Jun Pataleta 7d9c04e2e6 Merge branch 'MDL-75650-master-simple' of https://github.com/snake/moodle 2023-03-17 13:03:28 +01:00
Andrew Nicols 060b63cd1c Merge branch 'MDL-67789-master' of https://github.com/sarjona/moodle 2023-03-17 13:03:24 +01:00
Ilya Tregubov d438271cad Merge branch 'MDL-76989-master' of https://github.com/sarjona/moodle 2023-03-17 12:56:53 +01:00
Ferran Recio 602a308f25 MDL-76851 core_course: fix course view.php indentation 2023-03-17 11:07:13 +01:00
Ferran Recio 856b295569 MDL-76851 core_courseformat: plugin custom editor strings
Most section related actions require the frontend to use alternative
strings depending on the format plugin lang file. This patch adds
overridden strings to the current setViewFormat course editor setup
object.
2023-03-17 11:07:13 +01:00
Ferran Recio 9c583f5ec5 MDL-76851 core_courseformat: bulk section and cm delete action 2023-03-17 10:26:00 +01:00
AMOS bot 353d6af691 Automatically generated installer lang files 2023-03-17 00:07:46 +00:00
Paul Holden f6310247cb MDL-77666 contentbank: format category names for display. 2023-03-16 23:04:35 +00:00
info@eWallah.net f709c0293e MDL-77584 currencies: Fix outdated ISO 4217 code for Zambian Kwacha
On 2013-01-01 the ZMK code got replaced by the new ZMW code.

AMOS BEGIN
 MOV [ZMK,core_currencies],[ZMW,core_currencies]
AMOS END
2023-03-16 19:53:41 +01:00
Amaia Anabitarte 1c491de8e8 MDL-76997 admin: Option to reset course indentation 2023-03-16 17:22:02 +01:00
Paul Holden caf236427e MDL-76918 libraries: upgrade to version 1.3.1 of Rangy. 2023-03-16 16:08:33 +00:00
Sara Arjona 75f4fd0a74 MDL-76989 theme: Update Font Awesome icons in SCSS
The new Font Awesome version needs some changes in the way icons
are displayed from SCSS files:

- The atribute 'content: "\xxx"' needs to be converted to
'content: fa-content("\xxx")'
- The style must be declared. The regular is used by default, so all the
solid icons needs to add '@extend .fa-solid'
- @include fa-icons() is not required anymore (if used, the icons
are not displayed properly).
2023-03-16 13:17:53 +01:00
Meirza 30a220ec83 MDL-75464 libraries: upgrade EvalMath to 1.0.1 2023-03-16 17:27:30 +07:00
Meirza a314425cd0 MDL-77604 recentlyaccesseditems: convert HTMLCollection to an array.
While working on this issue MDL-76931(Upgrade core-js-bundle),
we need to convert a HTMLCollection like .children to an array to use forEach(),
so we can upgrade the core-js to the upper version.
2023-03-16 15:38:10 +07:00
Stefan Hanauska c556374d52 MDL-76309 mod_assign: Compatibility with zip download 2023-03-16 07:17:55 +01:00
Meirza a6894fc65e MDL-77337 analytics: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-16 09:46:07 +07:00
Paul Holden 5219aa3cf0 MDL-76339 mod_bigbluebuttonbn: correct upgrade note fix versions. 2023-03-15 19:15:00 +00:00
Paul Holden 0a9bdbc984 Merge branch 'MDL-76339-master' of https://github.com/call-learning/moodle 2023-03-15 19:03:03 +00:00
Paul Holden 8edec2c29f Merge branch 'master_MDL-76928' of https://github.com/mattporritt/moodle 2023-03-15 17:24:23 +00:00
Jun Pataleta 6a3a3e1cd5 Merge branch 'MDL-77600' of https://github.com/stronk7/moodle 2023-03-15 16:33:23 +01:00
Jun Pataleta f854dce12b Merge branch 'MDL-77343-master' of https://github.com/meirzamoodle/moodle 2023-03-15 16:33:23 +01:00
Stephan Robotta 7b8fa9de86 MDL-75908 navigation: fix active flag in navigation for custom menus 2023-03-15 11:16:44 +01:00
Sara Arjona bd0a6e6dcc MDL-67789 h5p: Save current state using xAPI State
Co-author: Andrew Lyons <andrew@moodle.com>
2023-03-15 09:42:18 +01:00
Ferran Recio 03a4abde0f MDL-67789 xapi: Add support to save content state 2023-03-15 09:42:18 +01:00
Meirza 29d20be214 MDL-77343 mod_assign: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-15 14:30:47 +07:00
Meirza c49d3231ad MDL-76932 libraries: remove old YUI lib 3.17.2 2023-03-15 13:35:00 +07:00
Andrew Nicols 888c5853db Merge branch 'MDL-77550-master' of https://github.com/dpalou/moodle 2023-03-15 14:26:11 +08:00
Meirza bf30ef1b53 MDL-76932 libraries: upgrade YUI lib to 3.18.1 2023-03-15 13:21:15 +07:00
Juan Segarra Montesinos 844ca05c2e MDL-77523 mod_data: textarea field should honor editor preferred format 2023-03-15 06:48:10 +01:00
Jake Dallimore 576369bf97 Merge branch 'MDL-77186-master' of https://github.com/andrewnicols/moodle 2023-03-15 12:00:42 +08:00
Jake Dallimore ecc0f661c5 Merge branch 'MDL-35745' of https://github.com/timhunt/moodle 2023-03-15 11:31:36 +08:00
Ilya Tregubov 3df60a19fd MDL-68093 workshop: Rebuilt js files. 2023-03-15 11:00:07 +08:00
Jun Pataleta ba7bf0781a Merge branch 'MDL-77344-master' of https://github.com/meirzamoodle/moodle 2023-03-15 10:34:07 +08:00
Ilya Tregubov a34dbbe6fe Merge branch 'MDL-68093_master' of https://github.com/marxjohnson/moodle 2023-03-15 10:19:07 +08:00
Jun Pataleta cf5d3d6757 Merge branch 'MDL-77611' of https://github.com/timhunt/moodle 2023-03-15 10:01:13 +08:00
Ilya Tregubov f67237598c Merge branch 'MDL-77419-master' of https://github.com/danghieu1407/moodle 2023-03-15 09:18:44 +08:00
AMOS bot be76a44f4e Automatically generated installer lang files 2023-03-15 00:07:44 +00:00
Paul Holden 012ff5b6ac MDL-59175 theme_boost: style inherited permission on overide page. 2023-03-14 20:58:18 +00:00
Meirza e8a39af31d MDL-77344 mod_forum: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-15 03:53:14 +07:00
cescobedo d84ebf69a8 MDL-76920 atto_html: Upgrade Codemirror to 5.65.12 2023-03-14 21:18:06 +01:00
cescobedo 4ad4d9287c MDL-76921 atto_html: Upgrade JS Beautify to 1.14.7 2023-03-14 21:17:08 +01:00
Sara Arjona efecce2ddf MDL-76989 behat: Increase download size for dataexport
After upgrading the Font Awesome from 4.7 to 6.3.0, the moodle.css
file is bigger than before, so a few behat tests related to the data
export (where the moodle.css file is included), need to be updated
to meet the new size.
2023-03-14 17:33:16 +01:00
Sara Arjona 0ad4ef1d3d MDL-76989 lib: Set Moodle files after Font Awesome upgrade
This patch updates the Font Awesome library version from 4.7 to 6.3.0.
The readme_moodle.txt has been updated properly because the new version
works slightly different.
There is a file to add backward compatibily to version 6 files (shim).
More information about how to upgrade from 4 to 6 can be found in
https://fontawesome.com/docs/web/setup/upgrade/upgrade-from-v4

Although a few icons have been renamed in Moodle 6, as the new version
is compatible with v4 icons, for now the references to the old icons
(fa fa-xxxx --> fa-solid fa-xxxx) haven't been changed yet.
A separate issue will be created to update them in the future and
review if some new icons can be used too.
2023-03-14 17:33:07 +01:00
Tim Hunt d5086a0938 MDL-77626 quiz statistics: Divide by zero if a random Q has max mark 0 2023-03-14 16:29:12 +00:00
Sara Arjona 6d7d2b012c MDL-76989 theme: Update FontAwesome to 6.3.0 2023-03-14 17:23:36 +01:00
Eloy Lafuente (stronk7) 4e663020ae MDL-77600 install: update the list of stale files for 4.2 2023-03-14 17:18:48 +01:00
Mark Johnson e57993e921 MDL-75746 mod_quiz: Fix backup and restore of quiz slots 2023-03-14 16:07:55 +00:00
Daniel Ziegenberg 3018036ebd MDL-67526 plagiarism: Final deprecation of plagiarism functions
Following MDL-65835 this now finally deprecates and removes the
functions:
  - plagiarism_save_form_elements(), please use
    {plugin name}_coursemodule_edit_post_actions() instead
  - plagiarism_get_form_elements_module(), please use
    {plugin name}_coursemodule_standard_elements() instead.
  - plagiarism_plugin::get_form_elements_module(), please
    use {plugin name}_coursemodule_edit_post_actions() instead.
  - plagiarism_plugin::save_form_elements(), please use
    {plugin name}_coursemodule_standard_elements() instead.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2023-03-14 17:04:20 +01:00
Mark Johnson 95d961fc2d MDL-72124 question: Fix system-level URLs in question events 2023-03-14 15:39:42 +00:00
Eloy Lafuente (stronk7) 12a8176926 on-demand release 4.2dev+ 2023-03-14 16:12:46 +01:00
Eloy Lafuente (stronk7) a51f525849 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-14 16:12:41 +01:00
Andrew Nicols 0b54a57e2a MDL-76867 core_admin: Remove tinymce following MDL-77308 2023-03-14 21:41:48 +08:00
Jun Pataleta 734f5446e3 Merge branch 'MDL-76991-master' of https://github.com/aanabit/moodle 2023-03-14 21:41:48 +08:00
Ilya Tregubov 1b7b8e21e0 MDL-76867 core_admin: Rebuild js. 2023-03-14 21:41:48 +08:00
Jun Pataleta 32fc5c14a0 Merge branch 'MDL-76680/master' of https://github.com/skodak/moodle 2023-03-14 21:41:48 +08:00
Ilya Tregubov a9acb554a1 Merge branch 'MDL-76867-master' of https://github.com/andrewnicols/moodle 2023-03-14 21:41:43 +08:00
Andrew Nicols cadd534db5 Merge branch 'MDL-76802-master' of https://github.com/sarjona/moodle 2023-03-14 21:40:45 +08:00
Tim Hunt c051fbd0c2 MDL-35745 quiz: let teachers to re-open a Never submitted attempt
In the quiz reports, for any 'Never submitted' attempt, there is
now a 'Re-open' button next to where it says the attempt state.

If that is clicked, there is an 'Are you sure?' pop-up. If the user
continues, the attempt is reopened. If the student now has time left,
the attempt is put into the In progress state. If there is not time
left the attempt is immediately submitted and graded. The
'Are you sure? pop-up says which of those two things will happen.
2023-03-14 13:09:27 +00:00
Juan Leyva 609e99b5cd MDL-73670 block: Remove hack to force returning the overview block 2023-03-14 13:14:29 +01:00
Mark Johnson 055f994afa MDL-68093 workshop: Add behat test for viewing reports by group 2023-03-14 08:52:26 +00:00
Mark Johnson 7095fe0caa MDL-68093 wiki: Restrict group options to participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson 1a520430d4 MDL-68093 survey: Add behat test for viewing response reports by group 2023-03-14 08:52:26 +00:00
Mark Johnson 31a1a7b455 MDL-68093 scorm: Add behat test for viewing reports by group 2023-03-14 08:52:26 +00:00
Mark Johnson 988b7cbfa6 MDL-68093 quiz: Add behat test for viewing results by group 2023-03-14 08:52:26 +00:00
Mark Johnson 647628e839 MDL-68093 lesson: Add behat test for non-participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson 247004108f MDL-68093 h5pactivity: Add restriction for participation groups. 2023-03-14 08:52:26 +00:00
Mark Johnson a1b1af77af MDL-68093 forum: Add behat tests for non-participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson 7f9e7f2982 MDL-68093 feedback: Add behat tests for non-participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson 8932fe55e5 MDL-68093 data: Add behat tests for groups 2023-03-14 08:52:26 +00:00
Mark Johnson 02f7e2d37b MDL-68093 choice: Add behat tests for groups 2023-03-14 08:52:26 +00:00
Mark Johnson dfa5310b80 MDL-68093 chat: Add behat tests for groups 2023-03-14 08:52:26 +00:00
Mark Johnson eb1aab3437 MDL-68093 bigbluebutton: Add behat tests for non-participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson 0775756551 MDL-68093 assign: Restrict group submission to participation groups 2023-03-14 08:52:26 +00:00
Mark Johnson cab6e97c1f MDL-68093 availability: Add support for private rule sets
This allows an availability plugin to indicate that a selected condition
should be considered "private", and therefore should never be shown to
users who don't satisfy the criteria. The availability_groups plugin
uses this to protect visibility of groups that are not visible to
non-members.
2023-03-14 08:52:25 +00:00
Mark Johnson 958da5b67e MDL-68093 groups: Add visibility and participation settings
These new settings are designed to enchance user privacy surrounding
groups. They allow groups to be configured so that users outside the
group cannot see the group, so that users in the group cannot see each
other, or so that users cannot see the group at all, even if they are in
it. This avoids issues where a group may be assigned based on sensitive
personal information (such as a person requiring special arrangements
due to a disability).

By default, groups are visible to all and available for participation in
activities, which maintains the current behaviour.

For performance, a new cache has been added to track the number of
groups on a course that are not visible to non-members. This allows us
to revert to the existing behaviour if the new features are not being
used at all on a course, and only apply the new visibility conditions if
they are.

Users who have the moodle/course:viewhiddengroups capability should be
concious of exposing hidden groups when showing their screen to other
users. The "Switch role to..." feature can be used to show a course page
on screen without exposing private availability conditions, for example.

The changes cover several specific areas:
* grouplib functions, which most code should use to get lists of groups
  and members (this includes the participants page).
* Activities supporting group overrides will not allow overrides for
  groups that are hidden from all users.
* Activities supporting separate/visible groups modes will only allow
  groups with the new "participation" flag enabled to be selected.
* Group messaging will be disabled for groups where members cannot see
  each other, or cannot see the group at all.
2023-03-14 08:52:25 +00:00
Juan Segarra Montesinos d7055c80e2 MDL-76257 core: Activity intro should honor user preference on creation 2023-03-14 06:02:39 +01:00
danghieu1407 b875ecdcc4 MDL-77419 Quiz: question/qengine.js tidy-up 2023-03-14 10:26:46 +07:00
Andrew Nicols 39f3b1ab66 MDL-77186 core: Move deprecated cron functions to deprecatedlib 2023-03-14 11:19:03 +08:00
Andrew Nicols 209cfe461d MDL-77186 core: Add upgrade note about core\cron migration 2023-03-14 11:19:03 +08:00
Andrew Nicols f6d9b81ebc MDL-77186 core: Address coding style violations in cron 2023-03-14 11:19:03 +08:00
Andrew Nicols 3cd05c7a15 MDL-77186 core: Move cron_setup_user to namespaced class 2023-03-14 11:19:03 +08:00
Andrew Nicols 070c781097 MDL-77186 core: Move max/default cron_keepalive to class const 2023-03-14 11:19:03 +08:00
Andrew Nicols 573066ba5f MDL-76867 core_admin: Standardise plugin management when plugin missing from disk 2023-03-14 11:07:43 +08:00
Huong Nguyen d2ae030fa7 MDL-76911 lib: Update jQuery to 3.6.4 2023-03-14 08:45:31 +07:00
Andrew Nicols 6aba049a64 MDL-76867 core_admin: Migrate media plugin management to dynamic table 2023-03-14 08:44:15 +08:00
Andrew Nicols 9bc9204a52 MDL-76867 core_admin: Migrate admin tool management to plugin management 2023-03-14 08:44:15 +08:00
Andrew Nicols 0d18f6d0d4 MDL-76867 core_admin: Migrate blocks admin ui to plugin management 2023-03-14 08:44:15 +08:00
Andrew Nicols 6d978dd35a MDL-76867 core_admin: Add support for editor sorting via ajax 2023-03-14 08:44:15 +08:00
Andrew Nicols f54cc61e4b MDL-76867 core_admin: Migrate editors admin ui to plugin management 2023-03-14 08:44:15 +08:00
Andrew Nicols 9f1c596dbd MDL-76867 core_admin: Migrate module management table to dynamic table 2023-03-14 08:44:15 +08:00
Andrew Nicols e2de093fe8 MDL-76867 editor_tiny: Add plugin management page 2023-03-14 08:44:15 +08:00
Andrew Nicols 51cfde0d3f MDL-76867 core: Add plugin management page 2023-03-14 08:44:15 +08:00
Andrew Nicols f4a48a517b MDL-76867 core_table: Allow dynamic table filterset to be specified
The previous behaviour guessed the table filterset based on the table's
class name, but this is not very flexible if you wish to create an
abstract table class and use a generic filter for all implementations.

This change adds the ability to specify the filterset class, with the
default behaviour using the table class name as a prefix.
2023-03-14 08:44:15 +08:00
Andrew Nicols fdb1df2bfd MDL-76867 core: Add plugintype_supports_disabling to plugininfo 2023-03-14 08:34:42 +08:00
Andrew Nicols 6809289cf4 MDL-76867 core: Plugintype coding style fixes 2023-03-14 08:34:42 +08:00
AMOS bot 19992963e6 Automatically generated installer lang files 2023-03-14 00:07:45 +00:00
Paul Holden 6b6e7eaad2 MDL-69882 phpunit: final removal of deprecated 310 helper methods. 2023-03-13 17:46:44 +00:00
Juan Leyva dd43bfd026 MDL-77585 grade: New WS gradereport_user_get_access_information 2023-03-13 15:20:34 +01:00
Tim Hunt e52dbcdef4 MDL-77611 tool_uploaduser: fix phpunit assumptions about profile fields 2023-03-13 13:31:33 +00:00
Andrew Nicols 347fc32088 MDL-77186 core: Rename incorrectly named test 2023-03-13 21:21:13 +08:00
Andrew Nicols 9ec46c232d MDL-77186 core: Move all uses of cronlib to new class 2023-03-13 21:21:13 +08:00
Andrew Nicols 99a67b615f MDL-77186 core: Move cronlib to namespaced class 2023-03-13 21:21:13 +08:00
Andrew Nicols 1b59967d71 MDL-77186 core: Add a new keepalive setting to cron 2023-03-13 21:19:55 +08:00
Andrew Nicols 097d2bda6c MDL-77186 admin: Add min/max limits to configduration 2023-03-13 21:19:37 +08:00
Andrew Nicols 733e85487a MDL-77186 core: Improve coding style for cron_run() 2023-03-13 21:19:37 +08:00
Andrew Nicols fbeb9f8952 MDL-77186 core: Improve coding style for cron.php 2023-03-13 21:19:36 +08:00
Sara Arjona f0a20c0a76 MDL-76802 core: Create a grunt task to get upgradable libs
A new grunt task, upgradablelibs, has been added in order to get the
list of libraries that have a newer version in their repositories.

Co-author: Andrew Lyons <andrew@moodle.com>
2023-03-13 11:53:23 +01:00
Amaia Anabitarte 6d2c321d7c MDL-76991 tool_mobile: Return course format indentation setting 2023-03-13 11:47:13 +01:00
Amaia Anabitarte a7c64595c8 MDL-76991 core_course: New course format setting to enable/disable indentation in weeks and topics 2023-03-13 11:47:13 +01:00
Sara Arjona edcfb3b27f MDL-76802 core: Add or update missing third-party repositories
While preparing the libraries that need to be upgraded for 4.2 in
MDL-76373 I've seen that the new Tiny editor missed the repository.
2023-03-13 11:39:30 +01:00
Paul Holden 3cb70de95f MDL-77608 mod_h5pactivity: namespace component lib testcase. 2023-03-13 09:36:40 +00:00
Laurent David 301c56ae1d MDL-77275 mod_data: Template reset button changes
* Remove the reset button in the sticky footer (template page)
* Add the reset button action in the Action menu
2023-03-13 07:35:44 +01:00
Simey Lameze 06cfcc8dae MDL-77574 myoverview: wait until next button exists before clicking 2023-03-13 14:11:35 +08:00
Jun Pataleta b711e80069 Merge branch 'MDL-77598' of https://github.com/paulholden/moodle 2023-03-13 14:08:45 +08:00
Jun Pataleta 973a6c39d6 Merge branch 'MDL-73144/402' of https://github.com/skodak/moodle 2023-03-13 13:34:19 +08:00
Jake Dallimore d0789c1a7a MDL-77382 core: fix error handling in oauth2 callback for auth'd users
Pass the errors back to the calling code when the user is authenticated,
otherwise, fall back on the existing redirection to the login page.
2023-03-13 10:47:23 +08:00
Jake Dallimore 2c38a73fe7 MDL-76926 enrol_lti: remove guzzle shim code as guzzle now in core 2023-03-13 10:42:56 +08:00
Jake Dallimore 550e45520d MDL-76926 libraries: update upgrade steps and 3rd party libs for lt1p3 2023-03-13 10:42:56 +08:00
Jake Dallimore efae8d36d5 MDL-76926 libraries: upgrade lib/lti1p3 to patched v5.2.6 2023-03-13 10:42:56 +08:00
Meirza 170561ee94 MDL-76914 libraries: upgrade Chart.js to 4.2.1 2023-03-13 08:53:26 +07:00
AMOS bot 9b79ec922c Automatically generated installer lang files 2023-03-12 00:07:55 +00:00
Petr Skoda 80d32fc93a MDL-76680 core: disable $USER->ignoresesskey on next page 2023-03-11 10:37:12 +01:00
Paul Holden 9bf8699b7c MDL-77598 editor_tinymce: ensure sub-plugins are also uninstalled. 2023-03-10 16:37:32 +00:00
Paul Holden 61cd980fb7 MDL-77598 logstore_legacy: complete plugin uninstallation step. 2023-03-10 16:19:12 +00:00
Petr Skoda 98bcff8d8e MDL-73144 core: switch to Dart sass 2023-03-10 16:25:17 +01:00
Jun Pataleta 5e1df25566 weekly release 4.2dev 2023-03-10 22:09:48 +08:00
Jun Pataleta 55831380be Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-10 22:09:46 +08:00
Nils Adermann e63ed5511b MDL-70687 session: Redis session lock exp = max exec time
If for any reason a Redis session lock is not being released, all subsequent
requests will wait to acquire the lock, forcing them to time out eventually.
This will happen till the original lock finally expires after the session timeout.

This sets the Redis session lock expiry time to whatever is lower,
either the PHP execution time `max_execution_time`, if the value was
defined in the `php.ini` or the globally configured `sessiontimeout`.
Setting it to the lower of the two will not make things worse it if the
execution timeout is longer than the session timeout.
For the PHP execution time, once the PHP execution time is over, we can
be sure that the lock is no longer actively held so that the lock can
expire safely. Although at `lib/classes/php_time_limit.php::raise(int)`,
Moodle can progressively increase the maximum PHP execution time, this
is limited to the `max_execution_time` value defined in the `php.ini`.
For the session timeout, we assume it is safe to consider the lock to
expire once the session itself expires.
If we unnecessarily hold the lock any longer, it blocks other session
requests.

Co-authored-by: Daniel Ziegenberg <daniel@ziegenberg.at>
Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2023-03-10 12:33:53 +01:00
Ilya Tregubov 5b277492ea Merge branch 'MDL-77429-master-fix' of https://github.com/andrewnicols/moodle 2023-03-10 14:52:27 +08:00
Andrew Nicols 17ff77a9c0 MDL-77429 course: Change course date to previous day
When a test runs just after midnight, and the user time zone is not the
same as the server timezone, and the course is created using a generator
(which runs in server time zone) but the UI presented in the user
timezone, the course start time is still in the future.

We need to create the course a day earlier to ensure that the "This
week" indicator is in the correct day.
2023-03-10 14:11:23 +08:00
Ilya Tregubov 2a52e1d742 MDL-77172 tool_capability: Rebuilt map file for search.js 2023-03-10 13:39:32 +08:00
Andrew Nicols 68f92f7a80 MDL-77037 core_course: Add new courseindex test to classic excludelist 2023-03-10 13:31:34 +08:00
Andrew Nicols b038d8ff3c Merge branch 'MDL-77582-master' of https://github.com/sarjona/moodle 2023-03-10 12:19:17 +08:00
Jun Pataleta d990390775 Merge branch 'MDL-77458-master' of https://github.com/andrewnicols/moodle 2023-03-10 12:06:16 +08:00
Ilya Tregubov 827b6ac216 Merge branch 'MDL-77172' of https://github.com/paulholden/moodle 2023-03-10 11:43:30 +08:00
Jake Dallimore 3f8994c07d Merge branch 'MDL-77517-master' of https://github.com/juancs/moodle 2023-03-10 11:38:11 +08:00
Brendan Heywood 327d1ced40 MDL-77530 tool_task: Fix coding errors in longrunningtasks check 2023-03-10 11:28:45 +08:00
Brendan Heywood 653ad78f43 MDL-77530 tool_task: Fix coding errors in checks 2023-03-10 11:28:45 +08:00
Ilya Tregubov 27e0329a08 Merge branch 'MDL-77291-master' of https://github.com/sarjona/moodle 2023-03-10 10:44:41 +08:00
Jun Pataleta 5896d29905 Merge branch 'MDL-76603-master' of https://github.com/junpataleta/moodle 2023-03-10 10:15:12 +08:00
Shamim Rezaie ae197c027a MDL-76603 gradingforms: Some A11y fixes on editing form
- Use span instead of dummy input elements because form elements need a
  label
- Sufficient size for target is at least 24px by 24px (Success Criteria
  2.5.8)
2023-03-10 10:08:42 +08:00
Shamim Rezaie 48b7dc597b MDL-76603 mod_assign: Move advanced grading grades out of the tables 2023-03-10 10:08:42 +08:00
Andrew Nicols 1fa8fa0fb5 Merge branch 'MDL-77567' of https://github.com/paulholden/moodle 2023-03-10 09:46:24 +08:00
Andrew Nicols 8393a0f288 Merge branch 'MDL-76849-master-5' of https://github.com/junpataleta/moodle 2023-03-10 09:29:28 +08:00
Jun Pataleta 7063f9c17f Merge branch 'MDL-70613' of https://github.com/paulholden/moodle 2023-03-10 09:19:55 +08:00
Sara Arjona 9ddb0132f6 Merge branch 'MDL-77323-master' of https://github.com/NashTechOpenUniversity/moodle 2023-03-09 16:48:34 +01:00
Paul Holden 1218a03850 MDL-70613 mod_feedback: cast feedback text values for table sorting.
Specifically avoids Oracle ORA-00932 (inconsistent CLOB datatype).
2023-03-09 14:59:05 +00:00
Andrew Nicols 43f5bfdbe4 Merge branch 'MDL-76970-master' of https://github.com/laurentdavid/moodle 2023-03-09 22:22:32 +08:00
Andrew Nicols 7beb5d5af2 Merge branch 'mdl-77329-master-clr' of https://github.com/ferranrecio/moodle 2023-03-09 22:18:25 +08:00
Andrew Nicols cc7cf2f49a Merge branch 'MDL-77431-master' of https://github.com/lucaboesch/moodle 2023-03-09 22:17:20 +08:00
Andrew Nicols 4330efc85f Merge branch 'MDL-77463-master' of https://github.com/andelacruz/moodle 2023-03-09 22:09:41 +08:00
Andrew Nicols 19a06a04a9 Merge branch 'MDL-77429-master' of https://github.com/andelacruz/moodle 2023-03-09 22:03:12 +08:00
Andrew Nicols 37fa8c6fc0 MDL-77037 core_course: Coding style fix in Behat feature 2023-03-09 21:59:29 +08:00
Andrew Nicols c9cc52aec1 Merge branch 'MDL-77037-master' of https://github.com/laurentdavid/moodle 2023-03-09 21:53:01 +08:00
Sara Arjona 6c6adc462c MDL-77582 mod_quiz: Fix view_url() on null error 2023-03-09 13:57:41 +01:00
James C 2702583d6c MDL-77329 course: Prevent collapse state loss 2023-03-09 11:49:55 +01:00
Sara Arjona 1a76b44a7a Merge branch 'MDL-76940-master' of https://github.com/laurentdavid/moodle 2023-03-09 10:54:41 +01:00
Ilya Tregubov 58fb00eb18 Merge branch 'MDL-77308-master' of https://github.com/andrewnicols/moodle 2023-03-09 17:02:07 +08:00
Jun Pataleta 7e8212c7ab Merge branch 'MDL-77533' of https://github.com/paulholden/moodle 2023-03-09 16:35:40 +08:00
Ilya Tregubov 1e8c9685fd Merge branch 'MDL-77056' of https://github.com/paulholden/moodle 2023-03-09 16:16:59 +08:00
Jun Pataleta 8441270181 Merge branch 'MDL-77559-master-2' of https://github.com/andrewnicols/moodle 2023-03-09 16:02:01 +08:00
Laurent David 387371bacd MDL-77037 core_courseformat: Refresh course index
* Refresh course index when language change
2023-03-09 08:41:02 +01:00
Andrew Nicols f58a71baab MDL-77308 core: Remove editor_tiny from core 2023-03-09 15:28:35 +08:00
Andrew Nicols edc4d51e6e Merge branch 'MDL-77420-master' of https://github.com/ferranrecio/moodle 2023-03-09 11:52:59 +08:00
Andrew Nicols 0a3b918b3c Merge branch 'MDL-77014-master' of https://github.com/lucaboesch/moodle 2023-03-09 11:41:49 +08:00
Andrew Nicols 61f32d5ec6 Merge branch '76945-bootstrap-dropdowns-master' of https://github.com/DSI-Universite-Rennes2/moodle 2023-03-09 10:53:50 +08:00
Andrew Nicols 5ae44ff9d3 Merge branch 'MDL-77467' of https://github.com/timhunt/moodle 2023-03-09 10:46:36 +08:00
Jun Pataleta 6ae65770b5 Merge branch 'MDL-77225' of https://github.com/timhunt/moodle 2023-03-09 10:43:15 +08:00
Andrew Nicols 8edff671b5 Merge branch 'MDL-77418' of https://github.com/paulholden/moodle 2023-03-09 10:35:16 +08:00
Andrew Nicols 1e1b1144c7 Merge branch 'master' of https://github.com/fcbsd/moodle 2023-03-09 10:28:22 +08:00
Andrew Nicols 29a48b540c Merge branch 'MDL-77539' of https://github.com/paulholden/moodle 2023-03-09 10:09:29 +08:00
Andrew Nicols 511401f4f6 MDL-77559 js: Rebuild all JS with Node 16 2023-03-09 09:53:19 +08:00
Jun Pataleta 5e51f083a1 MDL-76849 qtype_essay: Allow question number inclusion in answer fields
* Have the following classes extend qtype_essay_format_renderer_base
  as they have been meant to:
  - qtype_essay_format_editor_renderer
  - qtype_essay_format_noinline_renderer
  - qtype_essay_format_plain_renderer
* Add a question_display_options instance variable for
qtype_essay_format_renderer_base so its subclasses can use it to
generate the label for their respective answer fields.
2023-03-09 08:59:33 +08:00
Jun Pataleta 4e4e66cfe8 MDL-76849 qtype_shortanswer: Include question number in answer fields 2023-03-09 08:59:33 +08:00
Jun Pataleta 91205c8884 MDL-76849 qtype_numerical: Include question number in answer fields
* Also covers its qtype_calculated and qtype_calculatedsimple
which extend its renderer class
2023-03-09 08:59:33 +08:00
Jun Pataleta 7f7ce0d199 MDL-76849 qtype_multianswer: Include question number in answer fields
* Add the question number to the answer fields if it's available.
* Improve multiple choice question accessibility:
  - Label the multiple choice question groups appropriately by
    enclosing them in fieldset tags and applying sr-only legend tags to
    label them.
  - Apply Bootstrap form-check classes to the radio buttons, so they
    are rendered better and become responsive as well. This also helps
    avoid the use of the table element for layout purposes when
    rendering horizontal multiple choice sub-questions.
2023-03-09 08:59:33 +08:00
Jun Pataleta 28c6b39640 MDL-76849 qtype_match: Include question number in answer fields 2023-03-09 08:59:33 +08:00
Jun Pataleta 5739770d98 MDL-76849 qtype_truefalse: Include question number in answer fields
* Improve accessibility as well by grouping the radio buttons
in a fieldset.
2023-03-09 08:59:33 +08:00
Jun Pataleta 70ea4b9df1 MDL-76849 qtype_multichoice: Include question number in answer fields
* Improve accessibility as well by grouping the radio buttons/checkboxes
in a fieldset.
2023-03-09 08:59:33 +08:00
Jun Pataleta 5b4258d7a7 MDL-76849 qtype_ddwtos: Include question number in answer fields
* Plus include the item number so users will have an idea which blank
numbers they are currently on.
2023-03-09 08:59:33 +08:00
Jun Pataleta fdc24f0470 MDL-76849 qtype_gapselect: Include question number in answer fields 2023-03-09 08:59:33 +08:00
Jun Pataleta fb651434e0 MDL-76849 qtype: Add a questionidentifier instance variable
* Add an instance variable to question_display_options to store the
identifier associated with the question being rendered.
* This information can be used by question type plugins to improve the
accessibility of the answer fields being rendered by adding the
question identifier to the answer fields' labels.
* Adding the question identifier to the label can be achieved by using
question_display_options::add_question_identifier_to_label().

Co-authored-by: Tim Hunt <t.j.hunt@open.ac.uk>
2023-03-09 08:59:33 +08:00
Andrew Nicols a9f2cb6926 MDL-77559 js: Revert "MDL-75012 core: Bump NodeJS version requirements"
This reverts commit 6d0fdd8fd8.
2023-03-09 08:22:08 +08:00
Andrew Nicols 3c2be0bf6d MDL-77559 js: Revert "MDL-75012 js: Bump standard dependencies"
This reverts commit f70d9a3eef.
2023-03-09 08:21:55 +08:00
Andrew Nicols 7081e0beb0 MDL-77559 js: Revert "MDL-75012 js: Remove grunt-contrib-uglify"
This reverts commit abb6877596.
2023-03-09 08:21:36 +08:00
Andrew Nicols ab981109ef MDL-77559 js: Revert "MDL-75012 js: Bump stylelint and components"
This reverts commit 1c73373b3d.
2023-03-09 08:21:22 +08:00
Andrew Nicols faea97bd56 MDL-77559 js: Revert "MDL-75012 js: Update browserslist"
This reverts commit 19f5ffb28a.
2023-03-09 08:21:19 +08:00
Andrew Nicols b90a48dd46 MDL-77559 js: Revert "MDL-75012 js: Bump node-sass"
This reverts commit 7c3db6d458.
2023-03-09 08:21:15 +08:00
Andrew Nicols 4b7fbb189b MDL-77559 js: Revert "MDL-75012 js: Audit fix"
This reverts commit 472fc27ab9.
2023-03-09 08:21:12 +08:00
Andrew Nicols 9d7929cc15 MDL-77559 js: Revert "MDL-75012 js: Use our own jsdoc wrapper"
This reverts commit 5d0631b6a1.
2023-03-09 08:21:07 +08:00
Andrew Nicols 73bc2604f0 MDL-77559 js: Revert "MDL-75012 js: Bump shifter to new version"
This reverts commit b3f7721cdd.
2023-03-09 08:21:03 +08:00
Andrew Nicols 551c058b08 MDL-77559 js: Revert "MDL-75012 js: Put shifter on a diet"
This reverts commit 784098fe9e.
2023-03-09 08:20:57 +08:00
Andrew Nicols dde8111811 MDL-77559 js: Revert "MDL-75012 js: Drop support for modules built pre-babel"
This reverts commit 84c650489a.
2023-03-09 08:20:53 +08:00
Andrew Nicols 103892b3f0 MDL-77559 js: Revert "MDL-75012 js: Remove unused babel-preset-minify dependency"
This reverts commit ed3c951001.
2023-03-09 08:20:49 +08:00
Andrew Nicols 63cab4a560 MDL-77559 js: Revert "MDL-75012 js: Bump Babel dependencies"
This reverts commit ee0e2bcc8f.
2023-03-09 08:20:45 +08:00
Andrew Nicols 805d34f8c4 MDL-77559 js: Revert "MDL-75012 core: Fix upgrade.txt conflicts"
This reverts commit 8ce226081c.
2023-03-09 08:20:42 +08:00
Andrew Nicols 1e4a2f5dc8 MDL-77559 js: Revert "MDL-75012 js: Remove orphaned source maps"
This reverts commit baef734ef7.
2023-03-09 08:19:24 +08:00
AMOS bot 21202cca89 Automatically generated installer lang files 2023-03-09 00:07:44 +00:00
Tim Hunt 1c86e18fde MDL-77225 questions: fix regrade of descriptions in finished attempts
The added logic is similar to the logic in other behaviours, and the new test fails without it.
2023-03-08 19:00:01 +00:00
Sara Arjona 7b6a00dec4 Merge branch 'MDL-77464' of https://github.com/timhunt/moodle 2023-03-08 16:14:40 +01:00
Paul Holden f4134f6a73 MDL-77567 tool_behat: remove global library requires in external class.
We already deferred their loading in 3982341f, but the requires were since
added back mistakenly.
2023-03-08 14:54:13 +00:00
Laurent David 8f3d9e291e MDL-76940 core_courseformat: Index refreshing when role switch
* Hidden sections and content should not visible to students when switching role
2023-03-08 11:47:21 +01:00
Ilya Tregubov 25254ceea3 Merge branch 'MDL-77163-master' of https://github.com/andrewnicols/moodle 2023-03-08 17:28:13 +08:00
Ilya Tregubov ce3fd6a75d Merge branch 'MDL-77414-master' of https://github.com/andelacruz/moodle 2023-03-08 17:04:32 +08:00
Shamim Rezaie 74b103b218 MDL-76603 gradingform_rubric: preserve bg colour on hover 2023-03-08 19:32:07 +11:00
Shamim Rezaie 8b0fe1ee00 MDL-76603 gradingform_rubric: fix roles
- set the role of table to none
- moved aria-label from <table> element (that doesn't has role="none")
  to the element that has the radiogroup role
- if it's not radiogroup/radio, it is list/listitem
- removed aria-label from the rubric table and used caption instead
2023-03-08 19:32:07 +11:00
Angelia Dela Cruz 6c5740ba37 MDL-77429 Behat: Add coverage for changing course format as teacher 2023-03-08 15:47:34 +08:00
Jun Pataleta 42b994a808 Merge branch 'MDL-76919-master' of https://github.com/andrewnicols/moodle 2023-03-08 15:45:32 +08:00
Luca Bösch d70ed83644 MDL-77014 course: Single activity format course title multilang. 2023-03-08 08:03:22 +01:00
Laurent David f5d0b197f8 MDL-76970 mod_forum: Login prompt for guest users
* When user submit to a forum as an anonymous user, the login prompt
should clearly explain the follow up actions.
2023-03-08 07:50:35 +01:00
Andrew Nicols 974d7e4dab Merge branch 'MDL-52805-42' of https://github.com/Chocolate-lightning/moodle 2023-03-08 14:49:59 +08:00
Angelia Dela Cruz 0612c6f8a5 MDL-77414 Behat: Coverage for "Require all group members submit" setting 2023-03-08 14:44:45 +08:00
Sara Arjona 022acf037b Merge branch 'MDL-77440' of https://github.com/timhunt/moodle 2023-03-08 07:23:35 +01:00
Angelia Dela Cruz d1c03c435c MDL-77463 Behat: Coverage for assign submission notification to teacher 2023-03-08 14:11:10 +08:00
Jun Pataleta 530e55e077 Merge branch 'MDL-77472' of https://github.com/paulholden/moodle 2023-03-08 11:53:46 +08:00
Petr Skoda 9f178c1f81 MDL-77524 filter_algebra: fix error message 2023-03-08 11:26:40 +08:00
Jake Dallimore c61e59cd68 Merge branch 'MDL-77031-master' of https://github.com/mihailges/moodle 2023-03-08 11:00:08 +08:00
Paul Holden f0a557bffb MDL-75517 report_participation: filter report by viewable roles only. 2023-03-08 10:36:52 +08:00
Michael Hawkins 493205b6b2 MDL-77204 mod_wiki: Clean filename in Moodle1 backup 2023-03-08 10:33:14 +08:00
Paul Holden 81e74af17f MDL-77046 availability: validate profile field in condition. 2023-03-08 10:23:55 +08:00
Paul Holden a931a7f8ce MDL-76809 gradereport_history: pre-filter report userids filter.
Ensure current user is able to access each of the provided userids.
2023-03-08 09:59:49 +08:00
Ilya Tregubov bb69388f82 Merge branch 'MDL-77446-master' of https://github.com/andelacruz/moodle 2023-03-08 09:18:13 +08:00
Petr Skoda 1899e03973 MDL-76645 filter_data: fix link title attribute 2023-03-08 00:54:14 +00:00
Paul Holden 0e3c8eb740 MDL-77129 tool_lp: remove redundant call to set page header. 2023-03-08 00:54:14 +00:00
Paul Holden 355556c05f MDL-77008 mod_data: require sesskey to reset module templates. 2023-03-08 00:54:14 +00:00
Lars Bonczek 128c0c2160 MDL-75659 core: Don't render component argument twice in mustache pix helper 2023-03-08 00:54:14 +00:00
Jun Pataleta 85718f00d8 Merge branch 'MDL-77416-master-enfix' of https://github.com/vmdef/moodle 2023-03-08 08:50:30 +08:00
Jake Dallimore bc0bc7ac4c MDL-75650 core: add moodlenet oauth2 service to core 2023-03-08 08:48:20 +08:00
Jake Dallimore 40af893af5 MDL-75650 core: add oauth2 auth server config reader
Simple JSON reader which takes an issuer and reads its metadata. The
class is aware of request-centric rules, such as:
- The position of the well known suffix in the URL (per RFC8414)
- The requirement to have HTTPS auth server issuer URL
- The validity of query strings, paths and fragments in the auth server
issuer URL
,but makes no attempt to validate the config JSON returned.
2023-03-08 08:48:20 +08:00
AMOS bot 0f78929786 Automatically generated installer lang files 2023-03-08 00:07:47 +00:00
Paul Holden 198db552b0 MDL-77056 reportbuilder: relative date filter for before given period. 2023-03-07 22:46:50 +00:00
Roberto Bravo 6c3b8ae16d MDL-77256 tool_uploaduser: fix get allowed roles for courses
During user upload the permission to assign roles is checked in the wrong context
2023-03-07 18:37:22 +01:00
Dani Palou aba460cec9 MDL-77550 lesson: Format decimals in feedback page 2023-03-07 15:56:26 +01:00
Tim Hunt 1a3897d1ba MDL-77464 questions: regrading was losing question_attempt metadata
This is very similar to MDL-77090, but at the time, I missed that this
also needed to be handled. (Question metadata is, I think, only used
by the quiz 'Try another question like this one' feature.)
2023-03-07 13:40:10 +00:00
Paul Holden 5b7c1491fc MDL-69124 course: final removal of deprecated 310 method. 2023-03-07 12:43:44 +00:00
Ferran Recio 5e445c0e3a MDL-77420 core: fix modal close button on remove on close 2023-03-07 13:13:44 +01:00
Angelia Dela Cruz 76ce84befb MDL-77446 Behat: Add coverage for changing uploaded file details 2023-03-07 16:08:12 +08:00
Mathew May 00747e2641 MDL-52805 core: Remove references to old logging in behat 2023-03-07 13:08:46 +08:00
Mathew May 33ebbddde2 MDL-52805 core: Remove legacy log plugin and more calls 2023-03-07 13:08:46 +08:00
Mathew May 5dace7abc8 MDL-52805 core: Plugins with removed tests due to old events 2023-03-07 13:08:46 +08:00
Mathew May e5ca7766e7 MDL-52805 core: Remove legacy log calls 2023-03-07 13:08:46 +08:00
Andrew Nicols 565a615308 Merge branch 'MDL-77094' of https://github.com/timhunt/moodle 2023-03-07 12:08:58 +08:00
Andrew Nicols 830c9fd7dd Merge branch 'MDL-77336-master' of https://github.com/meirzamoodle/moodle 2023-03-07 12:01:30 +08:00
Andrew Nicols be76699b78 Merge branch 'MDL-77345-master' of https://github.com/meirzamoodle/moodle 2023-03-07 11:29:23 +08:00
Mathew May fce2e17633 MDL-52805 core: Add debugging for old event functions 2023-03-07 11:10:02 +08:00
Ilya Tregubov d4e2192da1 Merge branch 'MDL-75542-master' of https://github.com/PhMemmel/moodle 2023-03-07 08:21:47 +08:00
AMOS bot 8b1ce3c572 Automatically generated installer lang files 2023-03-07 00:07:44 +00:00
Sara Arjona 31aee1c82e MDL-77291 behat: Fix some behat scenarios
Some behat scenarios were using labels with links to access some
specific PHP files.
Now that labels are also displayed in the course index, the region
needs to be defined in the step to access to the expected link
(otherwise, the one in the course index will be used).
2023-03-06 17:26:37 +01:00
Tim Hunt 72d2d24815 MDL-77464 questions: update comments in question_attempt_step
The class comment had some inaccuracies which I fixed.
I also replaced all uses of @link with @see.
2023-03-06 16:23:13 +00:00
Sara Arjona c282cec66c Merge branch 'MDL-77460-master' of https://github.com/lameze/moodle 2023-03-06 16:33:53 +01:00
Paul Holden 76a48c8270 MDL-77539 blog: null coalesce external blog form name/description.
We can't pass null to most string related functions (e.g. `trim`) in
PHP8.1 onwards.
2023-03-06 14:49:07 +00:00
Paul Holden 39f6f7324e MDL-77541 customfield_select: final removal of deprecated 310 method. 2023-03-06 12:45:34 +00:00
fcbsd e2d138f250 MDL-77365 count_words: Make span> an inline tag 2023-03-06 10:59:44 +00:00
Meirza e2d5d50276 MDL-77336 admin: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-06 16:44:06 +07:00
Paul Holden e084865f19 MDL-77533 customfield: fix exception thrown during handler retrieval. 2023-03-06 09:05:52 +00:00
Meirza 210b1ea87b MDL-77345 mod_wiki: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.
2023-03-06 10:44:04 +07:00
Paul Holden 6a62ccc52a MDL-77472 grade: correct URL param type for adding tracking params. 2023-03-05 20:06:40 +00:00
Andrew Nicols c1f9b5122c Merge branch 'MDL-77462' of https://github.com/timhunt/moodle 2023-03-05 22:11:08 +08:00
Andrew Nicols 4018ca9023 Merge branch 'MDL-76922-master' of https://github.com/sarjona/moodle 2023-03-05 21:57:53 +08:00
Andrew Nicols 668f65f281 Merge branch 'MDL-76907-master' of https://github.com/sarjona/moodle 2023-03-05 21:54:42 +08:00
Andrew Nicols 031721c29f Merge branch 'MDL-76925-master' of https://github.com/sarjona/moodle 2023-03-05 21:53:11 +08:00
Juan Segarra Montesinos 35c2161472 MDL-77517 js: Disable "Edit mode" button when clicked
When clicked, disable the "Edit mode" button just before doing a
redirection. It's been reported that after clicling several times the
button, an inconsistent state between the button and the editing mode is
achieved. The patch mitigates the issue.
2023-03-05 06:40:49 +01:00
Paul Holden 47c0e48c9c MDL-77172 tool_capability: replace YUI search with ESM version. 2023-03-04 10:19:31 +00:00
Andrew Nicols c50c88e0e6 Merge branch 'MDL-77387_master' of https://github.com/pmaneggia/moodle 2023-03-04 13:30:30 +08:00
Víctor Déniz 6a9f78b0e7 MDL-77416 lang: Use fixed strings in tests 2023-03-03 14:15:30 +00:00
Helen Foster 2e99dd6346 MDL-77416 lang: Import fixed English strings (en_fix) 2023-03-03 14:02:06 +00:00
Andrew Nicols d3cdfc645e Merge branch 'MDL-70226-master' of https://github.com/sarjona/moodle 2023-03-03 20:51:22 +08:00
Sara Arjona 5c20b537b4 MDL-70226 course: Add more options to the activitychoosertabmode setting
Some extra options have been added to the activitychoosertabmode setting, to let
admins decide when to display the Recommended tab.
Apart from that, one of these values have be set as default value for this setting,
as suggested by the UX/PX teams. So the Starter and Full presets have been updated
too with the new values.
2023-03-03 13:45:15 +01:00
Sara Arjona 4e6593263d MDL-76925 lib: Set Moodle files after axe upgrade 2023-03-03 11:46:29 +01:00
Sara Arjona c0e910cc4b MDL-76925 lib: Upgrade axe to 4.6.3 2023-03-03 11:46:28 +01:00
Sara Arjona 0bcb4a66cb MDL-76922 lib: Set Moodle files after PHPSpreadSheet upgrade 2023-03-03 11:45:49 +01:00
Sara Arjona a95afa1316 MDL-76922 lib: Upgrade PHPSpreadSheet to 1.28.0 2023-03-03 11:45:49 +01:00
Sara Arjona 43c79ce226 MDL-76907 lib: Set Moodle files after minify upgrade 2023-03-03 11:45:10 +01:00
Peter Dias e9cb651b5d MDL-76907 core: Add custom Moodle patch to minify
There is a Pull-request from Tim Hunt to the project in GitHub
(https://github.com/matthiasmullie/minify/issues/317) but, for now,
as it hasn't been applied yet, we need to manually cherry-pick
this change.
2023-03-03 11:45:10 +01:00
Sara Arjona dc40a20ed7 MDL-76907 lib: Upgrade minify to 1.3.70 2023-03-03 11:45:10 +01:00
Paola Maneggia 7b5c35895b MDL-77387 course: drop 'moodle/course:view' for course copy UI
Enabling the course copy UI of MDL-64843 already without the capability 'moodle/course:view'
has the advantage, that a user with 'moodle/course:create', 'moodle/backup:backupcourse'
and 'moodle/restore:restorecourse' (typically a teacher)
will be able to use this UI for their own courses and with the additional benefit
of also being enrolled in the copied course.
Important: the role assigned to the user who copies a course is determined
by the value of the setting 'creatornewroleid', which defaults to 'editingteacher'.
2023-03-03 08:49:43 +00:00
Tim Hunt de086efd41 MDL-77462 core_question: avoid passing null to preg_match 2023-03-03 08:46:00 +00:00
Jun Pataleta 3f223172c6 Merge branch 'MDL-77428-master' of https://github.com/andelacruz/moodle 2023-03-03 16:35:22 +08:00
Ferran Recio 5f59807c06 MDL-77291 core_courseformat: show labels in course index 2023-03-03 09:15:11 +01:00
Andrew Nicols be39b195fd Merge branch 'MDL-77434-master' of https://github.com/lameze/moodle 2023-03-03 16:01:29 +08:00
Luca Bösch d855c47b77 MDL-77431 course: Let the bulk edit toggle look like edit mode switch. 2023-03-03 08:54:56 +01:00
Andrew Nicols 80f3336478 Merge branch 'master_MDL-77300' of https://github.com/mattporritt/moodle 2023-03-03 15:35:04 +08:00
Andrew Nicols 479d3a6ce9 Merge branch 'MDL-77370-master' of https://github.com/rbravod/moodle 2023-03-03 15:28:35 +08:00
Andrew Nicols dc31744914 Merge branch 'MDL-76908-master' of https://github.com/cescobedo/moodle 2023-03-03 15:01:43 +08:00
Philipp Memmel e026dd9caf MDL-75542 core_courseformat: Add param for expanding section 2023-03-03 07:54:07 +01:00
Andrew Nicols 74a44f78a3 Merge branch 'MDL-77232' of https://github.com/davidpesce/moodle 2023-03-03 14:39:32 +08:00
Matt Porritt 998a009c42 MDL-76909 Libraries: Upgrade Simplepie to 1.8.0 2023-03-03 16:42:01 +11:00
Laurent David b318fa7320 MDL-76339 mod_bigbluebuttonbn: Update dismissed recordings
* When the server is not reachable (or recordings are not reacheable)
the recording is set to RECORDING_STATUS_DISMISSED and is then
not visible in the list.
* Add a CLI script to solve potential issue with DISMISSED recordings
2023-03-03 05:48:53 +01:00
Jun Pataleta d5dd0e2c18 MDL-76849 question: New lang strings for answer fields 2023-03-03 12:48:02 +08:00
Matt Porritt 6a82ef2474 MDL-76923 Libraries: Upgrade ZipStream to 2.4.0 2023-03-03 15:09:08 +11:00
Andrew Nicols 4ee86a5256 Merge branch 'MDL-77327' of https://github.com/timhunt/moodle 2023-03-03 12:02:44 +08:00
Jake Dallimore 556208417d weekly release 4.2dev 2023-03-03 11:08:26 +08:00
Jake Dallimore 88978c38b9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-03-03 11:08:24 +08:00
Andrew Nicols 4113ab2f5e MDL-76919 editor_tiny: Improve import instructions
This includes a number of changes to improve how we manage the import of
security patches and repeatability of the build.
2023-03-03 10:57:38 +08:00
Andrew Nicols 1f9cf76c53 MDL-76919 editor_tiy: Bump to version 6.3.2 2023-03-03 09:32:31 +08:00
Tim Hunt 497c527e98 MDL-77467 retore: add progress tracking to potentially slow steps 2023-03-02 15:36:28 +00:00
David Pesce ab1b671110 MDL-77232 enrol_lti: Parallelize lti (1.3) gradesync using adhoc tasks 2023-03-02 09:33:20 -05:00
Meirza 6d2e7a56e0 MDL-76915 libraries: upgrade GeoIP2 to 2.13.0 2023-03-02 21:25:42 +07:00
Andrew Nicols e80987133b MDL-77458 core: Add supported php version info to phpcs config 2023-03-02 20:37:52 +08:00
Roberto Bravo 25c2d17157 MDL-77370 admin: Add a new setting for Support contact 2023-03-02 12:58:07 +01:00
Paul Holden 6e4f1b9a5e MDL-76910 libraries: upgrade to version 6.6.2 of TCPDF. 2023-03-02 11:31:02 +00:00
Mihail Geshoski a05cfc2487 MDL-77031 grade: Revamp the styling of the gradebook setup 2023-03-02 17:01:54 +08:00
Angelia Dela Cruz cb6355ee3c MDL-77428 Behat: Add coverage for forum post word count 2023-03-02 13:44:09 +08:00
Matt Porritt 78e2e20709 MDL-76906 Libraries: Upgrade ADODB to 5.22.4 2023-03-02 16:22:14 +11:00
Simey Lameze f7f3ccf06e MDL-77434 core: add a comment explaining the php versions strategy 2023-03-02 13:14:43 +08:00
Jun Pataleta baef734ef7 MDL-75012 js: Remove orphaned source maps 2023-03-02 13:04:55 +08:00
Jun Pataleta 8ce226081c MDL-75012 core: Fix upgrade.txt conflicts 2023-03-02 12:57:28 +08:00
Jun Pataleta 916503658d Merge branch 'MDL-75012-master-5' of https://github.com/andrewnicols/moodle 2023-03-02 12:34:34 +08:00
Andrew Nicols abccd6ba40 Merge branch 'MDL-77386-master' of https://github.com/ferranrecio/moodle 2023-03-02 12:06:27 +08:00
Andrew Nicols 30d898cbe6 Merge branch 'MDL-76825-master' of https://github.com/meirzamoodle/moodle 2023-03-02 12:05:07 +08:00
Jun Pataleta 724f8b8cb9 Merge branch 'MDL-75719-master-4' of https://github.com/ilyatregubov/moodle 2023-03-02 12:03:19 +08:00
Andrew Nicols 33b1e41f13 MDL-75012 js: Full build of all grunt things 2023-03-02 11:55:32 +08:00
Andrew Nicols ee0e2bcc8f MDL-75012 js: Bump Babel dependencies
Please note that whilst some dependencies have higher versions
available, these are not compatible at this time.
2023-03-02 11:55:32 +08:00
Andrew Nicols ed3c951001 MDL-75012 js: Remove unused babel-preset-minify dependency 2023-03-02 11:55:31 +08:00
Andrew Nicols 84c650489a MDL-75012 js: Drop support for modules built pre-babel
We now include more polyfills than we have ever done, and some of these
cause false-positives on our code to address modules which do not have a
name.

We started adding module names to modules in Moodle 3.8 at _build_ time
and kept support for modules which were not transpiled using Babel
before that point.

We no longer need to support this as all pre-3.8 Moodle versions are
long out of support. The most recent to go out of support was Moodle
3.5, which went completely out of support in May 2021.

We should not support code written and minified without a transpilation
phase from this time any longer.
2023-03-02 11:55:31 +08:00
Andrew Nicols b604b474d4 MDL-77141 gradereport_user: Adjust course name to fix test 2023-03-02 11:49:38 +08:00
Andrew Nicols c7c6573378 Merge branch 'MDL-77141-master' of https://github.com/lucaboesch/moodle 2023-03-02 11:49:00 +08:00
Jake Dallimore 32fd742690 Merge branch 'MDL-77461-master' of https://github.com/andrewnicols/moodle 2023-03-02 11:42:23 +08:00
Jake Dallimore ee3922a10f Merge branch 'MDL-77400-master' of https://github.com/dpalou/moodle 2023-03-02 11:27:04 +08:00
Andrew Nicols 9e8532058f Merge branch 'MDL-77368' of https://github.com/paulholden/moodle 2023-03-02 11:18:34 +08:00
Andrew Nicols 4946bb1bb0 Merge branch 'MDL-61458' of https://github.com/paulholden/moodle 2023-03-02 11:16:57 +08:00
Andrew Nicols 220191eca5 MDL-77461 behat: Use get_course_id instead of DB fetch 2023-03-02 11:06:28 +08:00
Ilya Tregubov bc87c5b391 MDL-75719 completion: Add Behat scenario for completion states. 2023-03-02 11:03:02 +08:00
Ilya Tregubov 9f062f1379 MDL-75719 completion: Fix unit tests and Behat tests.
Fix tests since we changed behavior of completions (completion
state an UI).
2023-03-02 11:03:02 +08:00
Ilya Tregubov 11a9bf7fd6 MDL-75719 completion: Fix viewed criteria.
When we unlock completion criteria and save changes 'viewed' criteria
still should be completed if user has viewed activity before. Seems
that that was broken by recent changes. Fixing here.
2023-03-02 11:03:02 +08:00
Ilya Tregubov fbb01b4724 MDL-75719 completion: Fix completion state for hidden grade items.
For hidden grade items we used to mark students as completed if
they have any grade. But this was not working correctly when we
also set pass grade for activity and completion criteria based
on pass grade. So we will have these completion states

Competion criteria 'Receive grade':
No grade - COMPLETION_INCOMPLETE
Grade visible, achieved passing grade - COMPLETION_COMPLETE_PASS
Grade visible, failed passing grade - COMPLETION_COMPLETE_FAIL
Grade hidden - COMPLETION_COMPLETE

Completion criteris 'Receive passing grade'
No grade - COMPLETION_INCOMPLETE
Grade visible, achieved passing grade - COMPLETION_COMPLETE_PASS
Grade visible, failed passing grade - COMPLETION_COMPLETE_FAIL
Grade hidden, achieved passing grade - COMPLETION_COMPLETE_PASS
Grade hidden, failed passing grade - COMPLETION_COMPLETE_FAIL_HIDDEN
2023-03-02 11:03:02 +08:00
Jake Dallimore 2520d8b099 Merge branch 'MDL-77318-master' of https://github.com/Utdanningsdirektoratet/moodle 2023-03-02 10:55:45 +08:00
Simey Lameze 56dd7bfb72 MDL-77460 behat: improve roles.feature test 2023-03-02 10:51:55 +08:00
Andrew Nicols b517dc7c88 Merge branch 'MDL-77150' of https://github.com/roland04/moodle 2023-03-02 10:46:49 +08:00
Andrew Nicols e258534b3f Merge branch 'MDL-75534-master-forum-usermodified-zero' of https://github.com/mudrd8mz/moodle 2023-03-02 10:38:15 +08:00
Jake Dallimore 9abd366ab7 Merge branch 'MDL-76298' of https://github.com/timhunt/moodle 2023-03-02 10:12:43 +08:00
Jun Pataleta 9533281da6 Merge branch 'MDL-77413-master' of https://github.com/andelacruz/moodle 2023-03-02 09:46:02 +08:00
Andrew Nicols 64e7cfabe6 Merge branch 'MDL-77391' of https://github.com/jrchamp/moodle 2023-03-02 09:26:13 +08:00
Andrew Nicols 5c1707e598 Merge branch 'MDL-77321' of https://github.com/paulholden/moodle 2023-03-02 09:24:44 +08:00
Matt Porritt 63d6e74a8e MDL-76916 Libraries: Upgrade PHP-JWT to 6.4.0 2023-03-02 12:23:55 +11:00
Andrew Nicols 832e7cba0d Merge branch 'MDL-77412' of https://github.com/sumaiyamannan/moodle 2023-03-02 09:23:49 +08:00
Andrew Nicols 0c8b3749f2 Merge branch 'MDL-40600-master-duplicate_section' of https://github.com/alexmorrisnz/moodle 2023-03-02 09:23:05 +08:00
Andrew Nicols 6a36f59497 Merge branch 'MDL-77135-master' of https://github.com/aanabit/moodle 2023-03-02 09:19:14 +08:00
Andrew Nicols 0fd0dff885 Merge branch 'MDL-75753-master' of https://github.com/call-learning/moodle 2023-03-02 09:14:06 +08:00
Andrew Nicols f6e53500d9 MDL-77277 theme_boost: Add reference to CL update 2023-03-02 09:13:09 +08:00
Andrew Nicols 54ac0ae079 Merge branch 'MDL-77277-master' of https://github.com/skodak/moodle 2023-03-02 09:11:22 +08:00
Jun Pataleta 1cbf445628 Merge branch 'MDL-74586-master-sqlrss' of https://github.com/mudrd8mz/moodle 2023-03-02 08:58:28 +08:00
Jun Pataleta 6802f6b7f4 Merge branch 'MDL-76938_restore_comments' of https://github.com/davosmith/moodle 2023-03-02 08:42:15 +08:00
Matt Porritt ba2dc81c80 MDL-76924 Libraries: Upgrade php-enum to 1.8.4 2023-03-02 11:41:49 +11:00
Matt Porritt 16dbf367c3 MDL-76928 Libraries: Upgrade lunr.js to 2.3.9 2023-03-02 11:15:49 +11:00
AMOS bot 9829bff032 Automatically generated installer lang files 2023-03-02 00:07:51 +00:00
Jun Pataleta 675dadaf55 Merge branch 'MDL-77430' of https://github.com/stronk7/moodle 2023-03-01 23:59:40 +08:00
Jun Pataleta 7eda9557c3 Merge branch 'MDL-77417' of https://github.com/stronk7/moodle 2023-03-01 23:54:34 +08:00
Petr Skoda 416d3ef5d6 MDL-77277 theme_boost: remove Bootstrap version reference 2023-03-01 13:02:24 +01:00
Jun Pataleta 222099cda1 Merge branch 'MDL-77250-master' of https://github.com/lameze/moodle 2023-03-01 17:08:07 +08:00
hieuvu cd81f29f55 MDL-77323 question: Prevent drag item sent into two drop zone 2023-03-01 14:48:32 +07:00
Jake Dallimore f7134f1083 Merge branch 'MDL-76897' of https://github.com/timhunt/moodle 2023-03-01 12:43:58 +08:00
Andrew Nicols 2b4c86e251 Merge branch 'MDL-77299-master' of https://github.com/meirzamoodle/moodle 2023-03-01 11:14:36 +08:00
Meirza f228e373cc MDL-77299 mod_quiz: Added missing class properties.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.

Co-authored-by: Tim Hunt <t.j.Hunt@open.ac.uk>
2023-03-01 10:09:19 +07:00
Meirza e4b24bdd79 MDL-77299 question: Added class properties that are not declared.
In PHP 8.2 and later, setting a value to an undeclared class property is
deprecated and emits a deprecation notice.
So we need to add missing class properties that still need to be declared.

Co-authored-by: Tim Hunt <t.j.Hunt@open.ac.uk>
2023-03-01 10:09:09 +07:00
Andrew Nicols 427659d202 Merge branch 'MDL-58945' of https://github.com/timhunt/moodle 2023-03-01 10:54:13 +08:00
Andrew Nicols cd53dbb5fe Merge branch 'MDL-68776' of https://github.com/paulholden/moodle 2023-03-01 10:53:08 +08:00
Andrew Nicols 31aed9a211 Merge branch 'MDL-74585' of https://github.com/paulholden/moodle 2023-03-01 10:51:26 +08:00
Andrew Nicols b049bc9ac5 Merge branch 'MDL-77322_basicauth_checkbox' of https://github.com/leonstr/moodle 2023-03-01 10:49:21 +08:00
Andrew Nicols eb9b349c9f Merge branch 'MDL-72727' of https://github.com/paulholden/moodle 2023-03-01 10:46:09 +08:00
AMOS bot de7b6c7760 Automatically generated installer lang files 2023-03-01 00:07:42 +00:00
Tim Hunt 0458c69d0d MDL-77327 qtype_ddmarker: remove use of unnecessary undeclared field
Also:
  * Fix some incorrect punctuation in two strings.
  * Add a test to verify that this change does not cause a regression.
  * Improve some PHPdoc comments.
2023-02-28 17:44:55 +00:00
Tim Hunt d65c17d16f MDL-77440 quiz: fix nav error reviewing after redoing a question 2023-02-28 16:29:03 +00:00
Petr Skoda 089b9a8846 MDL-77277 tool_componentlibrary: import Bootstrap v4.6.2 2023-02-28 23:46:00 +08:00
Petr Skoda 6db8f35c43 MDL-77277 theme_boost: import Bootstrap v4.6.2 2023-02-28 23:45:52 +08:00
Paul Holden 1e8c579812 MDL-61458 tool_lp: remove custom cohort autocomplete form selector.
The previous commit replaced the only remaining usage of it with the
equivalent core cohort form element. Prior to that, 21a0008f had done
the same.
2023-02-28 15:45:20 +00:00
Mikel Martín 292925d4c0 MDL-77150 reportbuilder: Fix report attributes classes are ignored
Fix report attributes with key 'class' being ingored when adding them to report classes.
2023-02-28 16:19:26 +01:00
Mikel Martín 86311f5a40 MDL-77150 core_table: Fix classes added as columnsattributes are ignored
Fix columnattributes with key 'class' being ingored by adding them to every 'column_class'.
2023-02-28 16:19:19 +01:00
Jonathan Champ cdf6c1ae88 MDL-77391 question admin: further improve query peformance in qtypes.php 2023-02-28 10:17:11 -05:00
Andrew Nicols 6555861856 Merge branch 'MDL-77425' of https://github.com/stronk7/moodle 2023-02-28 23:03:49 +08:00
Andrew Nicols a9fb039e3c Merge branch 'MDL-73018_bump-travis-and-gha-to-use-php81-instead-of-php80' of https://github.com/ziegenberg/moodle 2023-02-28 23:02:57 +08:00
cescobedo dc2d9ca7f7 MDL-76908 lib: update phpmailer to 6.7.1 2023-02-28 15:39:08 +01:00
Andrew Nicols 8ae5ebb507 MDL-77163 cachestore_mongodb: Remve from core 2023-02-28 22:24:04 +08:00
David Mudrák fcfe8ceef1 MDL-74586 rss: Make rss_get_userid_from_token() use table index
Due to missing `AND k.script = 'rss'` condition, the query did not make
use of the existing script-value compound index defined for the table.
So it had to perform the full sequential scan for all rows when
searching for the token. This had serious performance issues on sites
with many users, especially in case on non-existing token / key.
2023-02-28 13:21:35 +01:00
Eloy Lafuente (stronk7) d2c721b9e0 MDL-77430 plugininfo: php81 deprecation warnings on missing plugins
Whenever some plugin is missing from disk but installed, the plugins
page (and the upgrade) shows them as "missing from disk". Still, the
code tries to do things with their directory that, now, is null.

That was silently defaulting to '' in previous php versions, but
php81 emits a deprecated warning. So we have to check for them.
2023-02-28 11:34:21 +01:00
Jun Pataleta e4725be660 Merge branch 'MDL-76992-master' of https://github.com/aanabit/moodle 2023-02-28 18:26:12 +08:00
Daniel Ziegenberg 7427854c11 MDL-73018 ci: Move highest PHP to 8.1 (from current 8.0)
Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2023-02-28 11:21:48 +01:00
Dani Palou aec31e312a MDL-77400 reportbuilder: Fix enrolment status return type 2023-02-28 10:41:12 +01:00
Amaia Anabitarte 2a7632feb5 MDL-76992 core_courseindex: Apply indentation in the course index 2023-02-28 10:26:15 +01:00
Angelia Dela Cruz 9fded44344 MDL-77413 Behat: Minor changes to optimise the existing tests 2023-02-28 17:19:47 +08:00
Angelia Dela Cruz 4380682549 MDL-77413 Behat: Add coverage to verify groups can have a picture 2023-02-28 17:08:08 +08:00
Jun Pataleta 946a88c87e Merge branch 'MDL-77248-master' of https://github.com/andrewnicols/moodle 2023-02-28 15:46:54 +08:00
Andrew Nicols 0c0f6bffd8 MDL-77308 editor_tiny: Remove from core 2023-02-28 13:40:09 +08:00
Andrew Nicols 36b69bbb05 MDL-77248 mod_bigbluebuttonbn: Remove unused dpa pages 2023-02-28 12:04:51 +08:00
Andrew Nicols ce7c207203 MDL-77248 mod_bigbluebuttonbn: Set dpa accepted when creating activities
This only applies when creating activities using the test data
generator.
2023-02-28 12:04:51 +08:00
Andrew Nicols e6fe30187f MDL-77248 core: Move pre_enable_plugin_actions callback to enable_plugin
Note: The original callback was incorrectly using the $PAGE output,
which cannot be relied upon in this callback. The best we can do here is
to add a notification to explain the situation.
2023-02-28 12:04:50 +08:00
Andrew Nicols 797b76becf MDL-77248 core_admin: Tidy up coding style of admin/modules 2023-02-28 12:01:15 +08:00
Andrew Nicols 784098fe9e MDL-75012 js: Put shifter on a diet
This commit switches to a new custom version of Shifter which sees it
put on a massive diet.

Many of the standard Shifter features are totally unused by Moodle, but
they add dependency spaghetti. Some of those dependencies will start to
cause us issues as they have not been updated for a very long time, are
no longer maintained, and are no longer compatible with anything
resembling a recent version of NodeJS.
2023-02-28 10:22:45 +08:00
Andrew Nicols b3f7721cdd MDL-75012 js: Bump shifter to new version
This resolves an issue identified in 77083 which identified that GitHub
hashes shouldn't be treated as repeatable.

Whilst GitHub have reverted this change, it's still worth making this
change.
2023-02-28 10:19:51 +08:00
Andrew Nicols 5d0631b6a1 MDL-75012 js: Use our own jsdoc wrapper
grunt-jsdoc is abandoned and only works with an older version of jsdoc.

This is a very simple wrapper around jsdoc itself.
2023-02-28 10:19:51 +08:00
Andrew Nicols 472fc27ab9 MDL-75012 js: Audit fix 2023-02-28 10:19:51 +08:00
Andrew Nicols 7c3db6d458 MDL-75012 js: Bump node-sass 2023-02-28 10:19:51 +08:00
Andrew Nicols 19f5ffb28a MDL-75012 js: Update browserslist
To avoid build changes we exclude older versions of Android browser
2023-02-28 10:19:51 +08:00
Andrew Nicols 1c73373b3d MDL-75012 js: Bump stylelint and components 2023-02-28 10:19:50 +08:00
Andrew Nicols abb6877596 MDL-75012 js: Remove grunt-contrib-uglify
We stopped using this when we updated our processes to support ESMs in
MDL-62497. Removal of the dependency was missed at the time.
2023-02-28 10:19:50 +08:00
Andrew Nicols f70d9a3eef MDL-75012 js: Bump standard dependencies
This change bumps dependencies which have no impact upon the build
process
2023-02-28 10:19:50 +08:00
Andrew Nicols 6d0fdd8fd8 MDL-75012 core: Bump NodeJS version requirements 2023-02-28 10:19:50 +08:00
Jun Pataleta 855cc8c7d7 Merge branch 'MDL-76956-master' of https://github.com/sammarshallou/moodle 2023-02-28 10:07:01 +08:00
Jun Pataleta 1b0a923a75 Merge branch 'MDL-77276-master' of https://github.com/sarjona/moodle 2023-02-28 10:05:04 +08:00
Jun Pataleta 74c875b6da Merge branch 'MDL-76990-master' of https://github.com/aanabit/moodle 2023-02-28 09:45:32 +08:00
Matt Porritt d41770a249 MDL-77300 Site Registration: Prompt to register site after upgrade
Unregistered sites will now display registration form to admins
after every core upgrade. Non core upgrades will not trigger the
form.
Registration form will not show for sites that are not set to
public.
2023-02-28 11:39:28 +11:00
Paul Holden 0df45e134d MDL-72727 mod_forum: prevent default favourite toggle click event.
Allow the repository call to the web service method to complete before
re-directing, otherwise the call may not complete and/or races against
the page reload causing random Behat errors.
2023-02-27 23:24:08 +00:00
Sumaiya Javed 567504d8fd MDL-77412 reportbuilder: Make groupconcat aggregation method sortable. 2023-02-28 10:39:00 +13:00
Paul Holden 54b135e034 MDL-77321 reportbuilder: cache list of loaded reports per user.
Since 0188af39 we've cached loaded reports, however there was an
edge case in those report sources that relied on the current user
as part of their own initialization (e.g. checking capabilities).

Co-authored-by: Marina Glancy <marina@moodle.com>
2023-02-27 21:13:11 +00:00
Paul Holden 9ae5c203aa MDL-77418 mod_feedback: defensive use of analysis item data. 2023-02-27 19:21:22 +00:00
Tim Hunt 1b72db7082 MDL-76897 quiz: fix incorrect StdClass 2023-02-27 18:41:58 +00:00
Tim Hunt 20ccfc162d MDL-76897 quiz: deprecate unused quiz_calculate_best_attempt 2023-02-27 18:41:58 +00:00
Tim Hunt 728160cfbc MDL-76897 quiz: quiz_save_best_grade -> recompute_final_grade
also, the associated quiz_calculate_best_grade (only used here)
moved to a protected method.
2023-02-27 18:41:58 +00:00
Tim Hunt ff3f4eb2e7 MDL-76897 quiz: quiz_set_grade -> update_quiz_maximum_grade 2023-02-27 18:41:57 +00:00
Tim Hunt c212565151 MDL-76897 quiz: quiz_update_all_final_grades -> grade_calculator 2023-02-27 18:41:56 +00:00
Tim Hunt 4080962125 MDL-76897 quiz: quiz_update_all_attempt_sumgrades -> grade_calculator 2023-02-27 18:41:56 +00:00
Tim Hunt c12ff3d5f3 MDL-76897 quiz: get the context more efficiently where possible 2023-02-27 18:41:56 +00:00
Tim Hunt 1ee7f41762 MDL-76897 quiz: streamline initalisation of $quiz, $cm, $course 2023-02-27 18:41:55 +00:00
Amaia Anabitarte b37fe9a088 MDL-76990 core_course: Recover move right/left functionality 2023-02-27 18:27:57 +01:00
Eloy Lafuente (stronk7) 52f033b732 MDL-77425 travis: Ensure databases shutdown have time to complete
This is only randomly affecting to Moodle 4.2 with PostgreSQL 13
that, for some reason, returns the control to the script before
some files (.pid) have been deleted as part of the database
shutdown.

It seems that adding 1 second of sleep it's enough to workaround
that problem (there are examples of that in various Travis discussions).

So we are adding here 2 seconds, to ensure we are in the safe side
towards consistent passes. And we are applying the same strategy
also to the MySQL installation, just to keep them 100% parallel.
2023-02-27 16:52:14 +01:00
Paul Holden efbe491826 MDL-61458 tool_cohortroles: switch to core user/cohort form elements.
Remove last dependency on tool_lp plugin.
2023-02-27 12:20:16 +00:00
Paul Holden 4b8346eeec Merge branch 'MDL-77288-master' of https://github.com/lucaboesch/moodle 2023-02-27 10:38:51 +00:00
Eloy Lafuente (stronk7) 2d0c0dbcb6 MDL-77417 behat: behat_error_handler meets deprecation error types
Right now, any E_DEPRECATED, E_USER_DEPRECATED error type leads
to exception in behat runs, because the behat error handled is
not aware of them. See MDL-38041 for the initial implementation.

We don't want that to happen and they must behave like other "low"
error types (notices, warnings...), that will be reported in logs
or output, but won't trigger any exception, so the test can continue.

This commit just adds those 2 "new" error types to the handler,
providing the very same behaviour for them than the rest.
2023-02-27 09:33:08 +01:00
Meirza bd35a360ca MDL-76825 tiny: restyling link on focus for sufficient colour contrast.
Text elements must have sufficient colour contrast against the background,
restyling the link element when it is focused is to ensure colour contrast of at least 4.5:1
2023-02-27 09:27:46 +07:00
Meirza b12b738994 MDL-76825 tiny_media: Make IDs and labels unique. 2023-02-27 09:27:46 +07:00
Meirza 749a8c02f5 MDL-76825 theme: ensure button role has an accessible name. 2023-02-27 09:27:46 +07:00
Ferran Recio 01d6ba02a3 MDL-40600 core_courseformat: duplicate a named section with copy
When a named section is duplicated, the name must have a (copy) particle
to make visible what section is the original and what is the copy.
2023-02-27 09:19:26 +13:00
Alex Morris f1c4cc73df MDL-40600 course: Add ability to duplicate section 2023-02-27 09:10:36 +13:00
Leon Stringer ad592f442d MDL-77322 oauth2: Fix basicauth checkbox
Following MDL-61880 you could turn on "Authenticate token requests via
HTTP headers" but not turn this off again.  This change fixes this and
adds a Behat scenario to test toggling this checkbox is saved
correctly.
2023-02-24 17:25:43 +00:00
Tim Hunt dbd62aa94d MDL-76897 quiz: move quiz_update_sumgrades into grade_calculator 2023-02-24 16:14:51 +00:00
Tim Hunt 086bbf3f89 MDL-76897 quiz: create new class for all the grade calculation code 2023-02-24 16:14:51 +00:00
Laurent David 7bd13d581d MDL-75753 mod_bigbluebuttonbn: Support SHA256 and SHA512 checksum
* Add support for SHA256 and SHA512 checksum
2023-02-24 14:20:29 +01:00
Ferran Recio 30c172becf MDL-77386 core_courseformat: add plugin and module to cm state 2023-02-24 12:24:25 +01:00
Amaia Anabitarte 9f840c140d MDL-77135 block_myoverview: Remove duplicated strings
AMOS BEGIN
  CPY [zero_nopermission_title,block_myoverview],[zero_default_title,block_myoverview]
AMOS END
2023-02-24 12:01:45 +01:00
Sara Arjona 529faa9eaa MDL-77276 mod_data: Update reset single template string
When a single template is reset, the string displayed in the modal should
not reference to "all templates" to avoid confusion, as it was shown in the
original prototype for the 4.1 database project.
2023-02-24 11:21:49 +01:00
Luca Bösch 3d59f5073c MDL-77288 quiz: Horizontally align feedback to the border & full width.
Probably from historical reasons and because of layout of former Moodle
versions the container the feedback is situated in has 70% width and is
indented. In nowadays themes this looks weird and gives visual inconsistency.
2023-02-24 10:44:19 +01:00
Luca Bösch 6d330cfec6 MDL-77141 gradebook: Correct course name in user report 2023-02-24 10:44:17 +01:00
Jun Pataleta 9ee4f8db8b weekly release 4.2dev 2023-02-24 15:43:16 +08:00
Jun Pataleta 5be89588f8 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-02-24 15:43:13 +08:00
Andrew Nicols c1456aad07 Merge branch 'master_MDL-77376' of https://github.com/mattporritt/moodle 2023-02-24 12:31:48 +08:00
Andrew Nicols 9dff6e9c27 Merge branch 'MDL-76611' of https://github.com/paulholden/moodle 2023-02-23 19:04:29 +01:00
Andrew Nicols d8f6c76400 Merge branch 'MDL-76843' of https://github.com/timhunt/moodle 2023-02-23 19:04:29 +01:00
Andrew Nicols 8a27d2c082 Merge branch 'MDL-77271-master' of https://github.com/lameze/moodle 2023-02-23 19:04:29 +01:00
Ilya Tregubov 8773ff3f56 MDL-74433 mod_assign: Fix version.php 2023-02-23 19:04:29 +01:00
Andrew Nicols 9b82570918 Merge branch 'MDL-77290-master' of https://github.com/HuongNV13/moodle 2023-02-23 19:04:29 +01:00
Andrew Nicols 157387832b Merge branch 'MDL-76735-master' of https://github.com/HuongNV13/moodle 2023-02-23 19:04:29 +01:00
Ilya Tregubov 4a76af27df Merge branch 'MDL-74433' of https://github.com/larsbonczek/moodle 2023-02-23 19:04:29 +01:00
Andrew Nicols e515c15cfa Merge branch 'MDL-77352' of https://github.com/paulholden/moodle 2023-02-23 19:04:29 +01:00
Matt Porritt dd753f67e3 MDL-77376 Licensing: Update trademark.txt
Update Trademark policy in TRADEMARK.txt to
be in line with advice from the Moodle HQ
legal team
2023-02-23 15:35:25 +11:00
Andrew Nicols d174cf3f85 Merge branch 'MDL-76412-master' of https://github.com/raortegar/moodle 2023-02-23 11:04:07 +08:00
Andrew Nicols 7839d62111 Merge branch 'MDL-77354-master' of https://github.com/HuongNV13/moodle 2023-02-23 10:49:09 +08:00
Ilya Tregubov bb4633c967 Merge branch 'MDL-31235-master' of https://github.com/srobotta/moodle 2023-02-23 10:48:11 +08:00
Andrew Nicols 2b3baeb174 Merge branch 'MDL-76577/402' of https://github.com/skodak/moodle 2023-02-23 10:46:15 +08:00
Andrew Nicols 35f8c81d6f Merge branch 'MDL-77278-master' of https://github.com/ferranrecio/moodle 2023-02-23 10:43:50 +08:00
Andrew Nicols a95f9fc1fb Merge branch 'MDL-69838' of https://github.com/paulholden/moodle 2023-02-23 10:39:42 +08:00
Andrew Nicols 0af94c6bb7 Merge branch 'MDL-75005_42' of https://github.com/skodak/moodle 2023-02-23 10:29:15 +08:00
Andrew Nicols 82e035955c Merge branch 'MDL-76804-master' of https://github.com/lucaboesch/moodle 2023-02-23 10:13:31 +08:00
Ilya Tregubov d6c9b9eaed Merge branch 'MDL-77182-master' of https://github.com/ferranrecio/moodle 2023-02-23 10:09:51 +08:00
Andrew Nicols baae0cd2d6 MDL-77230 mod_feedback: Coding style violation fixes 2023-02-23 10:05:47 +08:00
Andrew Nicols 42fcac25e2 Merge branch 'MDL-77230-master' of https://github.com/sarjona/moodle 2023-02-23 10:05:33 +08:00
Ilya Tregubov 07053e8140 Merge branch 'MDL-76873' of https://github.com/paulholden/moodle 2023-02-23 09:57:45 +08:00
Andrew Nicols d7d5b417b6 Merge branch 'MDL-77210' of https://github.com/timhunt/moodle 2023-02-23 09:22:40 +08:00
Andrew Nicols 58820e2e56 Merge branch 'MDL-77149-master' of https://github.com/sammarshallou/moodle 2023-02-23 09:20:15 +08:00
Andrew Nicols 5a896a722c Merge branch 'MDL-76815' of https://github.com/paulholden/moodle 2023-02-23 09:14:03 +08:00
Paul Holden 09f51d1461 MDL-77368 forms: remove console logging of upload DOM element. 2023-02-22 17:44:30 +00:00
Tim Hunt dd1385b80d MDL-76843 quiz: add test to verify random essay stats now work 2023-02-22 14:30:23 +00:00
Tim Hunt 4484757021 MDL-76843 quiz: fix statistics questions for missing questions 2023-02-22 14:30:23 +00:00
Tim Hunt 837d1cbf52 MDL-76843 questions behat: enhancements requried to test this issue
* New steps to set up certian sorts of broken test data.
* Fix qtype_essay_question::un_summarise_response().
2023-02-22 14:30:22 +00:00
Paul Holden 922c61dee8 MDL-74585 core: pass string identifier/component to network keepalive.
Avoid passing potentially large amounts of data in the page AMD call,
allow the `core/network` module to load actual string content itself.
2023-02-22 13:49:30 +00:00
Tim Hunt b920f2b0d1 MDL-76298 drag-drop questions: validate the questions are complete
Previously, it was possible to create drag-drop markers and onto image
questions without any drag items or drop zones. This was non-sensical,
and broke statistics calculations.

So, missing validation added, and random guess score calculation made
robust.
2023-02-22 12:03:09 +00:00
Tim Hunt 3088bc6600 MDL-58945 qbank: showing q text should give option of plain or full 2023-02-22 11:15:02 +00:00
Ilya Tregubov 9f31d4cd5f Merge branch 'MDL-77285-master' of https://github.com/lameze/moodle 2023-02-22 12:26:33 +08:00
Huong Nguyen 0703ba8a51 MDL-77354 tool_behat: Fix deprecated strlen() of null in PHP 8.1 2023-02-22 11:07:49 +07:00
Ilya Tregubov 6138e692ca Merge branch 'MDL-76784-master' of https://github.com/sammarshallou/moodle 2023-02-22 10:51:41 +08:00
Huong Nguyen 3fbe7ace06 MDL-77290 tiny_media: Fix cannot update the created media
Including in this commit:
 - Changed the button text to Update media when the user is updating the media
 - Added new Behat tests
2023-02-22 09:33:31 +07:00
Ilya Tregubov 9fcb71d5ff Merge branch 'MDL-76850-master' of https://github.com/ferranrecio/moodle 2023-02-22 09:26:49 +08:00
Paul Holden d58b28d97e MDL-77352 javascript: declare debouncer outside the event handler.
It needs to be declared as such, otherwise each time the event is
triggered a new debouncer is created.
2023-02-21 22:38:59 +00:00
Paul Holden ffb123b6e8 MDL-76602 mod_lti: array syntax/whitespace cleanup. 2023-02-21 17:04:29 +00:00
Paul Holden 87912b7929 Merge branch 'MDL-76602-master-lti13claims' of https://github.com/cengage/moodle 2023-02-21 16:46:25 +00:00
Ferran Recio d43c14471b MDL-76850 core_courseformat: bulk duplicate activities 2023-02-21 12:26:04 +01:00
sam marshall 201b6db1ac MDL-77149 core_files: Network filesystem (Amazon EFS) can warn
If you delete a file with a hash and then create another file with
the same hash, sometimes on EFS filesystems while trying to create
the new file, it returns true to the file_exists check even though
the file doesn't exist, but then fails other calls.

This change makes Moodle tolerate that behaviour.
2023-02-21 10:53:31 +00:00
sam marshall a3b1e3b4ee MDL-76784 core_cache: versioned cache (modinfo) can fail in install
When cache is disabled but temporary in-memory caches are allowed,
these were direct instances of cachestore_static with no loader, which
meant that the get_versioned and set_versioned functions did not work.
2023-02-21 10:40:23 +00:00
Sara Arjona da2b7863c3 Merge branch 'MDL-76146-patch' of https://github.com/ilyatregubov/moodle 2023-02-21 11:32:03 +01:00
Ilya Tregubov d99995cec3 MDL-76146 gradereport_grader: Add class lost during rebase. 2023-02-21 18:07:12 +08:00
Ilya Tregubov 4145046020 Merge branch 'MDL-76848-master' of https://github.com/ferranrecio/moodle 2023-02-21 17:36:32 +08:00
Huong Nguyen 40db4f52d4 MDL-76735 editor_tiny: Fix random behat failure for Media image 2023-02-21 14:30:11 +07:00
Simey Lameze 26cf7b3fa9 MDL-77271 behat: verify user licence preference is remembered 2023-02-21 15:17:27 +08:00
Simey Lameze d9d8a1ad36 MDL-77271 behat: test to verify used licence cannot be deleted 2023-02-21 12:18:05 +08:00
Ilya Tregubov 414d3cdd5f Merge branch 'MDL-68347-master-2' of https://github.com/marinaglancy/moodle 2023-02-21 10:06:39 +08:00
Ilya Tregubov 69e47815d9 Merge branch 'MDL-76386-master' of https://github.com/laurentdavid/moodle 2023-02-21 09:47:38 +08:00
AMOS bot 1073989f90 Automatically generated installer lang files 2023-02-21 00:07:40 +00:00
Paul Holden 6111426f1d Merge branch 'MDL-76146-master' of https://github.com/ilyatregubov/moodle 2023-02-20 16:41:29 +00:00
Paul Holden 8939a00f66 Merge branch 'MDL-77269-master' of https://github.com/lameze/moodle 2023-02-20 12:17:41 +00:00
Simey Lameze 3236bf8e11 MDL-77269 licencemanager: show notification instead of an exception 2023-02-20 19:17:06 +08:00
Paul Holden 0972a5b7a9 Merge branch 'MDL-76545-master' of https://github.com/ferranrecio/moodle 2023-02-20 10:28:52 +00:00
Marina Glancy c184b2d284 MDL-68347 course: trigger event if user was created during restore 2023-02-20 10:20:00 +00:00
Paul Holden eeafcc715a MDL-76797 roles: add @since annotation to role created event. 2023-02-20 10:08:21 +00:00
Paul Holden 273e006419 Merge branch 'MDL-76797-master' of https://github.com/JBThong/moodle 2023-02-20 10:00:16 +00:00
Paul Holden 63e5431b25 Merge branch 'MDL-77287-master' of https://github.com/snake/moodle 2023-02-20 09:55:08 +00:00
Audun Jørstad Lillekjendlie c31425f4fd MDL-77318 core: Add role attribute to user navigation div 2023-02-20 10:52:02 +01:00
Paul Holden 25e8971b3a MDL-76873 user: method for returning profile field instance of type.
Re-factor implementation of profile field access within user fields
class to use that already provided by the fields themselves.
2023-02-20 09:24:05 +00:00
Paul Holden 65c4ae7bda MDL-76873 reportbuilder: correct checks for profile field visibility. 2023-02-20 09:22:00 +00:00
Laurent David 183d97a956 MDL-76386 core_user: Add/remove users dialog improvement
* Use language string to customise user information in the group Add/Remove dialog
2023-02-20 09:37:06 +01:00
Ferran Recio 4f7d5541c4 MDL-76545 core: fix reactive debug panel
The reactive debug panel stops working when a new reactive instance is
created in the fly. This was not detected until the new dragf and drop
files into course uses a second reactive UI component in the same page.
2023-02-20 09:01:57 +01:00
Ferran Recio 135c8a999c MDL-77182 core: add debug template info setting
A new developer setting that adds comments in the page HTML specifying
which template is used to render each part of the page. It can be set
form the site admin development tab and it is stored
as $CFG->debugtemplateinfo.
2023-02-20 08:54:06 +01:00
Thong Bui 5db011a600 MDL-76797 core_role: Add create role event class 2023-02-20 12:37:35 +07:00
Jun Pataleta b6432d5475 Merge branch 'MDL-45301_master_v3' of https://github.com/TomoTsuyuki/moodle 2023-02-20 10:15:17 +08:00
Andrew Nicols 68169e1fb9 Merge branch 'MDL-77020' of https://github.com/paulholden/moodle 2023-02-20 09:52:39 +08:00
Sara Arjona 0cde029237 MDL-77230 mod_feedback: Validate feedback access
The get_items() and get_page_items() external methods should return
items only when the user has access. Otherwise, empty array for items
will be returned, with the exact error in the warnings parameter.
2023-02-17 12:41:10 +01:00
Luca Bösch 0428998de2 MDL-76804 course: inserting activities UI element centered. 2023-02-17 11:09:12 +01:00
Ferran Recio 39743b5197 MDL-77278 theme_boost: fix sticky footer in firefox 2023-02-17 10:08:51 +01:00
Ferran Recio e6802896f7 MDL-76848 core_courseformat: bulk availability 2023-02-17 10:07:32 +01:00
Ferran Recio b1ad8480fe MDL-76848 core: add disable buttons to modals 2023-02-17 10:07:32 +01:00
Petr Skoda ac08f4f608 MDL-76577 block_html: fix incorrect use of draft files 2023-02-17 09:53:07 +01:00
Petr Skoda f0613d1bfa MDL-75005 core: remove invalid addslashes() 2023-02-17 09:50:06 +01:00
Jake Dallimore 0b1159cf85 MDL-77287 tool_oauth2: fix issuer form validation
This ensures validation errors from the issuer persistent are seen.
2023-02-17 15:15:10 +08:00
Stephan Robotta 75b8733197 MDL-31235 core_grades: use text filters for criterion fields 2023-02-17 08:11:14 +01:00
Tomo Tsuyuki 9e725bc168 MDL-45301 assign: Add font options for EditPDF 2023-02-17 15:30:25 +11:00
Ilya Tregubov 1b8ac1ff8c MDL-76146 gradereport_grader: remove deprecated preferences. 2023-02-17 11:35:05 +08:00
Ilya Tregubov 5cb18337cb MDL-76146 gradereport_grader: Remove show grade analysis icon preference 2023-02-17 11:34:09 +08:00
Ilya Tregubov c1a3087f8b MDL-76146 gradereport_grader: Remove show lock icon preference. 2023-02-17 11:34:09 +08:00
Ilya Tregubov 5eff5df97b MDL-76146 gradereport_grader: Remove show show/hide icon preference
Since we move those icons to actions menu we don't need this pref.
2023-02-17 11:34:09 +08:00
Ilya Tregubov 29c220583f MDL-76146 gradereport_grader: Move action icons to action menu. 2023-02-17 11:34:09 +08:00
Ilya Tregubov 149805bc78 MDL-76146 gradereport_grader: Code style fixes. 2023-02-17 11:34:08 +08:00
Ilya Tregubov 7cff9f25c5 MDL-76146 gradereport_grader: Remove non used files.
Seems it should have been deprecated long time ago.
2023-02-17 11:34:08 +08:00
Ilya Tregubov 67f2669510 MDL-76146 gradereport_grader: Deprecate AJAX grading interface.
Its not stable and not consistent.
2023-02-17 11:34:08 +08:00
Ilya Tregubov a335d50daa MDL-76146 gradereport_grader: Deprecate quick feedback. 2023-02-17 11:34:08 +08:00
Ilya Tregubov 8503f2cfd8 weekly release 4.2dev 2023-02-17 09:12:15 +08:00
Ilya Tregubov d0643a7f79 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-02-17 09:12:12 +08:00
Simey Lameze 3fa6293426 MDL-77285 behat: change window size to large to prevent error 2023-02-17 08:43:34 +08:00
AMOS bot 384cbde2c8 Automatically generated installer lang files 2023-02-17 00:07:56 +00:00
Paul Holden b3a50f4a82 MDL-76815 reportbuilder: avoid duplication getting audience component.
The component the audience belongs to is used by the cards exporter
for rendering the editing interface. Avoid duplication in determining
this value by defining appropriate method in the base class.
2023-02-16 12:15:52 +00:00
Paul Holden 7c432c0ffb MDL-77020 behat: refer to search input fields by name/role.
Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2023-02-16 10:56:28 +00:00
Audun Jørstad Lillekjendlie 494abd821b MDL-77020 core: Include a unique id in the search input field id 2023-02-16 10:19:14 +00:00
Andrew Nicols 4a5cf23d07 Merge branch 'MDL-75578-master' of https://github.com/mackensen/moodle 2023-02-16 12:01:08 +08:00
Jun Pataleta 3ed2b90708 Merge branch 'MDL-72182' of https://github.com/paulholden/moodle 2023-02-16 11:58:59 +08:00
Andrew Nicols 82bdffdf3e Merge branch 'MDL-77145-master' of https://github.com/davewoloszyn/moodle 2023-02-16 11:56:28 +08:00
Andrew Nicols 3eed2c7914 Merge branch 'MDL-76222' of https://github.com/paulholden/moodle 2023-02-16 11:53:55 +08:00
Andrew Nicols 55574803c1 Merge branch 'MDL-77102' of https://github.com/paulholden/moodle 2023-02-16 11:50:54 +08:00
Jun Pataleta e6343d70fd Merge branch 'MDL-76584' of https://github.com/paulholden/moodle 2023-02-16 11:49:21 +08:00
Andrew Nicols bea9ec6435 Merge branch 'MDL-77207-master' of https://github.com/meirzamoodle/moodle 2023-02-16 11:38:19 +08:00
Andrew Nicols 4fa300b78f Merge branch 'MDL-76415-master' of https://github.com/meirzamoodle/moodle 2023-02-16 11:31:42 +08:00
Andrew Nicols 6b05cf75a8 Merge branch 'MDL-76582-master' of https://github.com/NashTechOpenUniversity/moodle 2023-02-16 11:25:11 +08:00
Andrew Nicols 18073fe93b Merge branch 'MDL-74698' of https://github.com/jonof/moodle 2023-02-16 11:06:33 +08:00
Ilya Tregubov 26af3bc26e MDL-76313 forum: code style changes. 2023-02-16 10:59:55 +08:00
Ilya Tregubov f85505169b Merge branch '76313-forum-improve-accessibility-master' of https://github.com/DSI-Universite-Rennes2/moodle 2023-02-16 10:59:32 +08:00
Andrew Nicols 6d31626130 Merge branch 'MDL-76791-master' of https://github.com/sammarshallou/moodle 2023-02-16 10:53:25 +08:00
Ilya Tregubov 2e9025e90d MDL-75379 core: Code style changes. 2023-02-16 10:49:24 +08:00
Ilya Tregubov 0c93d7654d Merge branch 'MDL-75379' of https://github.com/larsbonczek/moodle 2023-02-16 10:48:49 +08:00
Andrew Nicols 892d75be7c Merge branch 'MDL-76878' of https://github.com/paulholden/moodle 2023-02-16 10:42:37 +08:00
Ilya Tregubov a5c00c17f9 Merge branch 'MDL-73519-master' of https://github.com/meirzamoodle/moodle 2023-02-16 09:30:21 +08:00
Andrew Nicols 124e1462bc MDL-77250 editor_tinymce: set base URL and URI 2023-02-16 08:32:41 +08:00
Paul Holden 9074c28699 Merge branch 'MDL-77086-master' of https://github.com/sarjona/moodle 2023-02-15 16:21:48 +00:00
Paul Holden 12229dd389 Merge branch 'MDL-77009-master' of https://github.com/andrewnicols/moodle 2023-02-15 15:51:06 +00:00
Andrew Nicols ffe97712e5 Merge branch 'MDL-76413-master' of https://github.com/raortegar/moodle 2023-02-15 23:38:34 +08:00
Andrew Nicols 3db03d69b5 Merge branch 'MDL-76478-password-unmask' of https://github.com/brendanheywood/moodle 2023-02-15 23:07:23 +08:00
Andrew Nicols f8f4677592 Merge branch 'MDL-76948' of https://github.com/larsbonczek/moodle 2023-02-15 23:01:04 +08:00
Andrew Nicols f60c946408 Merge branch 'MDL-73317-master' of https://github.com/matthewhilton/moodle 2023-02-15 22:56:35 +08:00
Paul Holden 77c4493a11 Merge branch 'MDL-77147' of https://github.com/timhunt/moodle 2023-02-15 11:49:21 +00:00
raortegar a03e6363de MDL-76412 general: Fixed PHP 8.2 utf8_encode deprecations 2023-02-15 10:27:38 +01:00
raortegar f6608a7e32 MDL-76412 lib: Fixed PHP 8.2 utf8_encode deprecations in phpxmlrpc 2023-02-15 10:27:38 +01:00
raortegar 87f235e0bb MDL-76412 lib: Fixed PHP 8.2 utf8_encode deprecations in horde 2023-02-15 10:27:33 +01:00
raortegar dc51096889 MDL-76412 lib: Fixed PHP 8.2 utf8_encode deprecations tinymce 2023-02-15 09:56:40 +01:00
Ilya Tregubov d54a1d78f1 Merge branch 'MDL-75230-master' of https://github.com/andelacruz/moodle 2023-02-15 16:12:19 +08:00
Jun Pataleta 9b4e8fa082 Merge branch 'MDL-77171-master' of https://github.com/andrewnicols/moodle 2023-02-15 11:22:56 +08:00
Andrew Nicols 0035504108 Merge branch 'MDL-77241' of https://github.com/paulholden/moodle 2023-02-15 11:14:26 +08:00
Jun Pataleta 215f4b5893 Merge branch 'MDL-77156-master' of https://github.com/lucaboesch/moodle 2023-02-15 11:12:17 +08:00
Jun Pataleta c02a4d0511 Merge branch 'MDL-77212' of https://github.com/paulholden/moodle 2023-02-15 11:09:19 +08:00
Jun Pataleta 98055a3468 Merge branch 'MDL-77223' of https://github.com/roland04/moodle 2023-02-15 11:07:16 +08:00
Jun Pataleta 03128a758e Merge branch 'MDL-77201' of https://github.com/paulholden/moodle 2023-02-15 11:05:39 +08:00
AMOS bot 5d4ee19d43 Automatically generated installer lang files 2023-02-15 00:07:56 +00:00
Paul Holden a309d643ab Merge branch 'MDL-77140-master' of https://github.com/snake/moodle 2023-02-14 15:51:32 +00:00
Paul Holden ca77e6a192 Merge branch 'MDL-75454-master' of https://github.com/davewoloszyn/moodle 2023-02-14 15:05:58 +00:00
Paul Holden 34e7f27664 MDL-77241 course: optional chaining safety for section toggles. 2023-02-14 12:51:08 +00:00
Paul Holden 79b12bc335 Merge branch 'MDL-63608' of https://github.com/AnupamaSarjoshi/moodle 2023-02-14 11:59:50 +00:00
Paul Holden 650b6caf83 MDL-77201 reportbuilder: pass current aggregation to column callbacks. 2023-02-14 11:03:03 +00:00
Paul Holden fe30100f98 Merge branch 'MDL-73937' of https://github.com/ssj365/moodle 2023-02-14 09:43:10 +00:00
Ilya Tregubov c6493c7d3e Merge branch 'MDL-76947-master' of https://github.com/davewoloszyn/moodle 2023-02-14 13:52:34 +08:00
Ilya Tregubov 0140a3cc6f Merge branch 'MDL-76620-master' of https://github.com/call-learning/moodle 2023-02-14 13:25:54 +08:00
David Woloszyn 02418cc093 MDL-75454 cache: Reduced exposure of sesskey param 2023-02-14 11:25:49 +11:00
Shamiso.Jaravaza 1054a794d6 MDL-73937 mod_bigbluebuttonbn: Remove lockedlayout 2023-02-13 15:24:35 -07:00
Tim Hunt b7a67f8896 MDL-77210 quiz: fix regrade for attempts with redone questions 2023-02-13 16:55:52 +00:00
Mikel Martín 96215abdc8 MDL-77223 reportbuilder: Fix first report column as integer 2023-02-13 16:15:38 +01:00
Meirza 5265300706 MDL-76415 report_eventlist: Fixed str interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:47 +07:00
Meirza 2a33c2736a MDL-76415 core_privacy: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:47 +07:00
Meirza 1c218880a9 MDL-76415 portfolio: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:47 +07:00
Meirza 1e8ed4e305 MDL-76415 mod_forum: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:47 +07:00
Meirza 3c0fa9b9cb MDL-76415 assignfeedback_editpdf: Fixed str interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza d8474a647a MDL-76415 gradereport_singleview: Fixed str interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza e2cd808b34 MDL-76415 core: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza 6b02417e8c MDL-76415 core_course: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza 113c78a110 MDL-76415 tool_componentlibrary: Fixed str interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza 90e94a3498 MDL-76415 blocks: Fixed ${var} string interpolation deprecations.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza e9822519eb MDL-76415 lib: Fixed ${} string interpolation deprecations in phpxmlrpc
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza 3f850a8a4a MDL-76415 lib: Fixed ${var} str interpolation deprecations in php-jwt.
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Meirza 89131a73c2 MDL-76415 lib: Fixed ${var} string interpolation deprecations in php-ml
Since PHP 8.2, placing the dollar sign outside the curly brace is deprecated when
the expression inside the braces resolves to a variable or an expression.
2023-02-13 19:51:46 +07:00
Lars Bonczek 0a704a6b03 MDL-75379 core: Use non-static template cache 2023-02-13 12:33:33 +01:00
Paul Holden 2f73d7a232 MDL-76611 cohort: prevent duplicate idnumber in inplace editable. 2023-02-13 10:33:23 +00:00
raortegar 3a673213fb MDL-76413 lib: Fixed PHP 8.2 callable deprecations in evalmath 2023-02-13 10:36:46 +01:00
raortegar d7fd2c788a MDL-76413 lib: Fixed PHP 8.2 callable deprecations in minify 2023-02-13 10:35:38 +01:00
raortegar 0e715b0c52 MDL-76413 lib: Fixed PHP 8.2 callable deprecations in adodb 2023-02-13 10:35:38 +01:00
raortegar 08e0045c03 MDL-76413 general: Fixed PHP 8.2 Callable deprecations 2023-02-13 10:35:38 +01:00
Paul Holden e5f01178a6 MDL-77212 tiny_accessibilitychecker: remove unused lang string fetch. 2023-02-13 08:48:51 +00:00
Sara Arjona 597564d7b4 MDL-77086 badges: Improve debugging
Display more information, like the status error, when the badge can't
be sent to the backpack.
2023-02-13 08:40:45 +01:00
Ilya Tregubov c11fac04c1 Merge branch 'MDL-77189-master' of https://github.com/lameze/moodle 2023-02-13 13:42:58 +08:00
Simey Lameze 0876de8868 MDL-77189 behat: basic coverage for wikimedia repository 2023-02-13 13:12:00 +08:00
Jun Pataleta d1d808b5b4 Merge branch '76314-forum-fix-forumtype-and-groupmode-validation-master' of https://github.com/DSI-Universite-Rennes2/moodle 2023-02-13 11:39:22 +08:00
Jun Pataleta 099508cce7 Merge branch '76312-forum-subscriber-sorting-master' of https://github.com/DSI-Universite-Rennes2/moodle 2023-02-13 11:27:17 +08:00
Jun Pataleta db79d463b6 Merge branch 'MDL-62839' of https://github.com/JasonEverling/moodle 2023-02-13 10:05:58 +08:00
Meirza b77041ff28 MDL-77207 core: PHP 8.2 makes exported class name fully qualified. 2023-02-11 16:12:37 +07:00
Anupama Sarjoshi 05d51c15ca MDL-63608 quiz: Fix Access order when manually grading quizzes
Changes done to fix access order of attempts that need manual grading.
Changed button text from 'Save and go to next page' to 'Save and show next' to improve UI.
2023-02-10 17:42:10 +00:00
Luca Bösch d19685ba69 MDL-77156 enrol_self: deprecated trim() of null in PHP 8.1 2023-02-10 18:20:08 +01:00
Paul Holden 1ea152c99a weekly release 4.2dev 2023-02-10 13:47:28 +00:00
Paul Holden 9ca082a5b0 NOBUG: Fixed SVG browser compatibility 2023-02-10 13:47:26 +00:00
Paul Holden 77c7943c0a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2023-02-10 13:47:26 +00:00
Paul Holden 889f35fc26 MDL-69838 core: final removal of deprecated 310 methods. 2023-02-10 11:20:00 +00:00
Paul Holden 5021b3a5b5 MDL-68776 search: remove support for optional add_documents return.
All six returned array elements must now be present.
2023-02-10 10:41:50 +00:00
Julien Boulen 9f3baf8c4f MDL-76314 forum: add form check to prevent combining wrong parameters
Form validation prevents combining the forum type "single discussion" and the group mode "separate groups".
2023-02-10 11:07:21 +01:00
Julien Boulen 0b1e4b57b6 MDL-76312 forum: sort subscribers list by fullname 2023-02-10 10:26:31 +01:00
Jun Pataleta 36564d26ba Merge branch 'MDL-74272-fix' of https://github.com/sarjona/moodle 2023-02-10 16:52:36 +08:00
Sara Arjona ad1a9e85de MDL-74272 behat: Fix issue with headless
It seems unrelated to this patch... But git bisect pointed it here.
2023-02-10 09:42:53 +01:00
Jake Dallimore 7e6f706717 MDL-77140 mod_lti: fix content item return for new TinyMCE versions 2023-02-10 10:11:34 +08:00
David Woloszyn 694b3ef878 MDL-77145 enrol: Removed course shortname from unenrolme string 2023-02-10 11:10:15 +11:00
Jason A Everling 6f4011db33 MDL-62839 mod_lti: change instructorchoiceacceptgrades default value
update mod_lti behat test: renametool.feature, added  "Accept grades from the tool" to "1"
2023-02-09 10:22:17 -06:00
Paul Holden 6f4675e043 MDL-76222 tool_customlang: non-translatable export CLI filename.
This matches the name used for manual (via UI) language export.
2023-02-09 14:18:05 +00:00
Andrew Nicols ea1f5eba27 Merge branch 'MDL-76904-master' of https://github.com/NashTechOpenUniversity/moodle 2023-02-09 12:04:21 +08:00
Andrew Nicols 219d15895e Merge branch 'MDL-74755' of https://github.com/paulholden/moodle 2023-02-09 11:44:16 +08:00
Jun Pataleta 6845a7f74f Merge branch 'MDL-77052-master' of https://github.com/Utdanningsdirektoratet/moodle 2023-02-09 11:27:43 +08:00
Jun Pataleta 5ab615c610 Merge branch 'MDL-77161-master' of https://github.com/andrewnicols/moodle 2023-02-09 11:18:24 +08:00
Andrew Nicols 8d35d59bf3 Merge branch 'MDL-76354' of https://github.com/paulholden/moodle 2023-02-09 10:58:29 +08:00
Jun Pataleta c909797ec1 Merge branch 'MDL-77007-master' of https://github.com/andrewnicols/moodle 2023-02-09 10:52:55 +08:00
Andrew Nicols c7a1f4c748 Merge branch 'MDL-77018' of https://github.com/timhunt/moodle 2023-02-09 10:50:58 +08:00
Andrew Nicols 2de031b74c Merge branch 'MDL-76066-master' of https://github.com/aanabit/moodle 2023-02-09 10:27:00 +08:00
Andrew Nicols 9890d88107 Merge branch 'MDL-77057' of https://github.com/paulholden/moodle 2023-02-09 10:19:22 +08:00
Andrew Nicols 43962ec9ce Merge branch 'MDL-72559-master' of https://github.com/keevan/moodle 2023-02-09 10:17:12 +08:00
Matthew Hilton 5ea4d886ee MDL-73317 assign: Move useridlist cache construction
Move the construction of the useridlist $SESSION cache to when a key
is requested.

This stops the writing of $SESSION when backing up
or restoring mod_assign instances, which is neccessary since the
backup and restore scripts close the session when processing.
2023-02-09 12:03:49 +10:00
Matthew Hilton f106babf53 MDL-73317 search: Close session later in script
The session write_close was moved to the earliest point in the script
that does not modify the session. This is currently always after
$OUTPUT->header()
2023-02-09 12:03:49 +10:00
Matthew Hilton 49c4cfb2d5 MDL-73317 restore: Reset navcache before closing session
As part of a restore, the session is closed early so it does not
interrupt the users session during the restore.

Currently the restore controller rebuilds the course caches while
restoring. This inadvertently resets the navcache, which would edit the
session despite it being closed.

Because this tracker now adds logging for this behaviour, it means
restoring now outputs a debugging message as a warning.

To resolve the debugging message, the navcache is now reset just before
closing the session. This is allowed, since the caches are designed
to be volatile.
2023-02-09 12:03:49 +10:00
Matthew Hilton 863bad8d7e MDL-73317 report_participation: Close session later in script
The script has been reorganised so that it closes the session as early
as possible, without causing session changes after close being logged.

In this case, after the table has been output it is OK to close the
session.
2023-02-09 12:03:49 +10:00
Matthew Hilton 4faa3204d6 MDL-73317 session: Log extra details for cachestore changes
More visibility depth is required for cachestore changes since they
are usually multi dimensional arrays.
2023-02-09 12:03:49 +10:00
Matthew Hilton 9c8d8502c0 MDL-73317 session: Log session changes after close
A snapshot of the session is now taken when write_close is called.
The session at shutdown is then compared to the snapshot. If changes
are detected, they are logged. This aids developers in seeing if
early session closes may be having unintended consequences.
2023-02-09 12:03:49 +10:00
Matthew Hilton 95077da502 MDL-73317 session: Improve session diff detection
Previously, newly added keys to the session were not detected. Objects
with the same properties were also incorrectly reported as different.

This commit improves this, and updates the unit tests to reflect the
new functionality.
2023-02-09 12:03:49 +10:00
Andrew Nicols cfb728bebb Merge branch 'MDL-76499-master' of https://github.com/andelacruz/moodle 2023-02-09 09:52:53 +08:00
Andrew Nicols 9dca529997 Merge branch 'MDL-70586-master' of https://github.com/sarjona/moodle 2023-02-09 09:40:34 +08:00
Andrew Nicols d56df7c204 Merge branch 'MDL-76912' of https://github.com/paulholden/moodle 2023-02-09 09:37:00 +08:00
Andrew Nicols c9956b2c94 Merge branch 'MDL-77177' of https://github.com/paulholden/moodle 2023-02-09 07:11:32 +08:00
Paul Holden 29c13cc54b Merge branch 'MDL-76672-master' of https://github.com/Utdanningsdirektoratet/moodle 2023-02-08 14:57:30 +00:00
Jun Pataleta 73cd0ff616 Merge branch 'MDL-74272-master' of https://github.com/sarjona/moodle 2023-02-08 22:25:18 +08:00
Paul Holden f85f441914 Merge branch 'MDL-76542-master' of https://github.com/lameze/moodle 2023-02-08 14:22:10 +00:00
Laurent David 00eecda571 MDL-76620 mod_bigbluebuttonbn: Fix guest behat test
* Refactor guest_access.feature behat test
2023-02-08 14:27:47 +01:00
Laurent David 8fcf662484 MDL-76620 mod_bigbluebuttonbn: Fix guest access with forcelogin
*With "forcelogin" setting turned on, the new external guest
 links in the bigbluebutton plugin do not work but show the login screen instead
2023-02-08 14:27:47 +01:00
Sara Arjona 72f75ef344 MDL-74272 theme_boost: Coding style improvements 2023-02-08 13:05:26 +01:00
Sara Arjona 5d7d947553 MDL-74272 theme_boost: Remove plugin name on course page
In 4.0, the plugin name was added above their name. Based on the community
feedback and the research done by the UX team, this needs to be removed.
This commit removes the activity name when edit mode is disabled.
2023-02-08 13:04:31 +01:00
Paul Holden ef47376a37 Merge branch 'MDL-73692-master-Add-support-for-missing-timestamps-to-rss-block' of https://github.com/melanietreitinger/moodle 2023-02-08 11:22:08 +00:00
Melanie Treitinger e5709fc588 MDL-73692 blocks: Add support for missing timestamps to rss block. 2023-02-08 11:20:48 +01:00
Paul Holden a09dc53828 MDL-77177 mod_data: re-factor internal method argument order.
We cannot have required method parameters after optional, it doesn't
make sense. Also it causes deprecation notices in PHP8.1.
2023-02-08 09:57:52 +00:00
Jun Pataleta 65228171e5 Merge branch 'MDL-74905' of https://github.com/stronk7/moodle 2023-02-08 17:19:38 +08:00
Angelia Dela Cruz 367027f979 MDL-75230 behat: Lesson Behat tests optimised
Replace steps that manually add Lesson instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2023-02-08 14:20:21 +08:00
Simey Lameze 64799f9ace MDL-76542 behat: add step to go to user edit page directly 2023-02-08 12:22:29 +08:00
Simey Lameze d991b12d15 MDL-76542 behat: create custom profile fields using data generators
This commit also adds a new test to verify the custom profile fields
works using the user interface.
2023-02-08 12:12:08 +08:00
Jun Pataleta 8b3e36f8a8 Merge branch 'MDL-76755-master' of https://github.com/davewoloszyn/moodle 2023-02-08 11:34:21 +08:00
Paul Holden 4402b0b677 MDL-77154 course: access checks in course format fragment callbacks. 2023-02-08 11:11:00 +08:00
Andrew Nicols 01da499897 Merge branch 'MDL-76418-master' of https://github.com/srobotta/moodle 2023-02-08 08:52:59 +08:00
Stephan Robotta a8de5c5002 MDL-76418 course: section action menu item to show permlink to section 2023-02-07 17:56:46 +01:00
Andrew Nicols 41ccc8acb9 MDL-77171 core: Remove legacy tooltip/popuphelp YUI mods 2023-02-07 23:52:01 +08:00
Paul Holden 6f81371f7a Merge branch 'MDL-77112-master' of https://github.com/lucaboesch/moodle 2023-02-07 15:18:52 +00:00
Jun Pataleta f9ced0f475 Merge branch 'MDL-76901' of https://github.com/paulholden/moodle 2023-02-07 22:56:20 +08:00
Jun Pataleta 9bba8650c0 Merge branch 'MDL-76569-master' of https://github.com/andrewnicols/moodle 2023-02-07 22:54:12 +08:00
Andrew Nicols 7bf57d9850 MDL-77161 cachestore_memcached: Remove from core 2023-02-07 21:42:50 +08:00
Paul Holden bfb5197738 MDL-76901 reportbuilder: cache custom report element persistents.
During request lifecycle ensure that column, filter and condition
persistents are only loaded a single time to prevent additional
database reads.

Provide invalidation method, used by the report helpers, to ensure
that the persistents are re-loaded appropriately.

Co-authored-by: Marina Glancy <marina@moodle.com>
2023-02-07 13:10:14 +00:00
Lars Bonczek 9b7c8f54ab MDL-74433 mod_assign: Fix logging of submission removal 2023-02-07 12:33:49 +01:00
Jun Pataleta 34b1252fbf Merge branch 'MDL-76089-master' of https://github.com/junpataleta/moodle 2023-02-07 15:35:46 +08:00
Marina Glancy e6d6224271 MDL-76089 lib: upgrade horde library 2023-02-07 15:21:05 +08:00
Andrew Nicols 685d9c277f Merge branch 'MDL-77023' of https://github.com/paulholden/moodle 2023-02-07 12:47:58 +08:00
Andrew Nicols c7ac3be265 Merge branch 'MDL-77123-master' of https://github.com/cameron1729/moodle 2023-02-07 12:38:28 +08:00
Andrew Nicols 94cb2bbc60 Merge branch 'mdl-76729_master' of https://github.com/james-cnz/moodle 2023-02-07 12:36:52 +08:00
Andrew Nicols bff31d527c Merge branch 'MDL-75946-master' of https://github.com/davewoloszyn/moodle 2023-02-07 10:38:52 +08:00
Andrew Nicols 81f9751c9e Merge branch 'MDL-76691-master' of https://github.com/sarjona/moodle 2023-02-07 10:36:40 +08:00
Sara Arjona 876c3a39d5 MDL-76691 core_h5p: Add editor lib changes after upgrading it 2023-02-06 16:48:08 +01:00
Sara Arjona 0929df7d35 MDL-76691 core_h5p: Upgrade editor lib to moodle-1.23 2023-02-06 16:48:08 +01:00
Sara Arjona ca37dd3baf MDL-76691 core_h5p: Add core lib changes after upgrading it
Apart from applying the points described in readme_moodle.txt, the following
changes have been done too:

- The parameter $folderName from the method libraryToString() have been removed
and a new method, libraryToFolderName() has been added to the H5PCore API.
References to libraryToString() with the $folderName set to true have been
replaced to the new method.
- missing-main-library has been added and replaces in some cases to
missing-required-library.
- The framework saveLibraryData method must be called before saveLibrary
(h5p.classes.php file has been patched to leave the original order because
libraryid is required to save the itemid).
- The getLibraryId() method from H5PCore has been rewritten to use MUC, in
order to avoid PHPUnit failures.
2023-02-06 16:48:07 +01:00
Sara Arjona d18d90602b MDL-76691 core_h5p: Upgrade core lib to moodle-1.23 2023-02-06 16:48:07 +01:00
sam marshall 3353aecc8b MDL-76791 core_cache: Locking breaks for multiple-identifiers store
Cache locking fails if the cache store supports multiple identifiers
(in core, the only two which do are cachestore_static and
cachestore_mongodb, so this is unlikely to cause severe problems).
2023-02-06 15:46:17 +00:00
Sara Arjona e1ac3833f5 MDL-70586 mod_feedback: Hide the Preview questions icon for students
The Preview questions icon shouldn't be displayed unless the user can
edit the feedback or access to the reports; otherwise, it's causing
confusion (especially when the feedback is not opened).
2023-02-06 16:33:09 +01:00
Jun Pataleta 08a061ad5d Merge branch 'MDL-76432-master-v02' of https://github.com/ferranrecio/moodle 2023-02-06 22:30:40 +08:00
Paul Holden f37b990a7a Merge branch 'MDL-77078-master' of https://github.com/andelacruz/moodle 2023-02-06 13:33:01 +00:00
Andrew Nicols c4fceb6237 Merge branch 'MDL-75688-master' of https://github.com/call-learning/moodle 2023-02-06 21:18:06 +08:00
Andrew Nicols e5c8a01996 Merge branch 'MDL-77042' of https://github.com/paulholden/moodle 2023-02-06 21:15:16 +08:00
Audun Jørstad Lillekjendlie 4b5ba65000 MDL-76672 block_myoverview: add role attribute for filter div 2023-02-06 14:05:54 +01:00
Tim Hunt 9091406f71 MDL-77147 question admin: optimised the query in admin/qtypes.php 2023-02-06 12:46:22 +00:00
Audun Jørstad Lillekjendlie 316c52d150 MDL-77052 block_recentlyaccesseditems: HTML role attribute
HTML elements with role=list must contain children with role=listitem
2023-02-06 13:45:17 +01:00
Ferran Recio 1113f8328e MDL-76432 core_courseformat: migrate file drag and drop
Replace the old course/dragdrop.js file (which was not even minimised)
to AMD modules and integrate them to the new reactive course editor.
From now on, a file can be drop over any course section, no matter if it
is in the course content or in the course index. It will also start
using the new process monitor to show the uploading state to the user.
2023-02-06 12:59:25 +01:00
Ferran Recio a3f116367e MDL-76432 core_courseformat: add file_handlers webservice
In 4.0- version each time the course page is loaded the file handlers
are calculate din the backend and injected directly into JS using a json
encapsulation. With this new webservice the handlers can be obtained
directly from the frontend when needed.
2023-02-06 12:59:25 +01:00
Ferran Recio e359b9889a MDL-76432 core: reactive drapdrop file support
This commit adds all the necessary CSS and logic to handle file dropping
into a reactive compoment. From now on, a reactive application can
handle both element drag&drop and file drop easily.
2023-02-06 12:58:44 +01:00
Ferran Recio 2846751f2b MDL-76432 core: add process monitor UI component
Create a new UI compoment to queue, execute and display errors on batch
processing. The first use of this component is when the teacher drops a
file into the course page.
2023-02-06 12:58:43 +01:00
Ferran Recio ff5f669cf8 MDL-76432 aria: add getFirst to nomalise
Half of the times the normalise module is used is to get a single
element. However, because jQuery elements can contain multiple elements
the getList is always an array. Due to this in many ocasions we repeat
the getList(VAR)[0] line instead of having a more readable getFirst
method which only implies a couple of lines in the original code.
2023-02-06 12:58:43 +01:00
Paul Holden 21bd0c3430 Merge branch 'MDL-76370-publicpaths-proxying' of https://github.com/jaydn/moodle 2023-02-06 11:02:41 +00:00
Marina Glancy e861734286 MDL-72182 my: tests for resetting dashboard
Co-authored-by: Paul Holden <paulh@moodle.com>
2023-02-06 09:34:18 +00:00
Paul Holden b31b37aaae MDL-72182 user: cross-DB compatibility for getting user pages/blocks. 2023-02-06 09:34:18 +00:00
Paul Holden c766043420 MDL-74755 block_accessreview: stricter checking of enabled config. 2023-02-06 09:31:31 +00:00
Andrew Nicols 92d04b9e7b Merge branch 'MDL-77091' of https://github.com/paulholden/moodle 2023-02-06 12:58:56 +08:00
Andrew Nicols 98b8ee2e1e Merge branch 'MDL-76783-master' of https://github.com/ferranrecio/moodle 2023-02-06 12:57:43 +08:00
Andrew Nicols eee93ead3a Merge branch 'master_MDL-77062' of https://github.com/guillogo/moodle 2023-02-06 12:56:48 +08:00
David Woloszyn 92facc90e2 MDL-76947 css: Fixed layout regression on dropdown menus 2023-02-06 15:11:04 +11:00
Angelia Dela Cruz 3d7fa69c02 MDL-77078 Behat: Coverage for assignment submission statement 2023-02-06 10:43:10 +08:00
AMOS bot 9445b9afd0 Automatically generated installer lang files 2023-02-06 00:07:44 +00:00
Anastasios Bithas e12ab61deb MDL-73642 mod_assign: Disable draft option if submission already made 2023-02-04 18:40:07 +02:00
Andrew Nicols 6414935cca Merge branch 'MDL-76662' of https://github.com/paulholden/moodle 2023-02-04 21:37:23 +08:00
Eloy Lafuente (stronk7) 012a4c5cf8 MDL-74905 ci: travis and gha, raise to agreed requirements
Basically, we only need to change:
- PHP 8.0
- MySQL 8.0
- PostgreSQL 13

Also, remove any php-xmlrpc installation because they aren't
needed since Moodle 4.1.

Finally, ensure that we aren't using mysql bin logs ever, because
they are huge and can make the 1Gb tmpfs to become full. This is
specifically needed for MySQL 8.0, because it comes with bin logs
enabled by default.

We have forked the mysql-action to achieve that:

https://github.com/moodlehq/mysql-action

Worth blaming travis because, after PG 11 and 12 using port 5433,
now they are back (in PG 13) to port 5432. Surely there is some
logic behind the undocumented ping-pong but...
2023-02-03 19:48:02 +01:00
Eloy Lafuente (stronk7) fa269897c7 MDL-74905 upgrade: remove all the < 3.11.0 upgrade steps
Note that, despite the commit message, this is not possible. Moodle
3.11.0 (and 3.10.0) were developed in parallel with Moodle 4.0, and
when they were released, the master branch had already diverged, so
the master branch does not contain the comment lines:

"// Automatically generated Moodle v3.11.0 release upgrade line"

And they are needed to know which parts of the upgrade are safe to delete.

So we only proceed to delete all those steps from lib/db/upgrade.php
which version is known to be < 2021051708 (v3.11.8), master ones will
be, always bigger than that. We don't touch plugin upgrade scripts
because they may have different versions, not 100% matching the
2021051708 rule, so there will be an excess of steps there.

Note this is not a big problem, just a few more steps will be skipped and
that's all. Whenever we bump the Moodle requirements again (to Moodle
4.0 or up), the lines will be back and we'll be able to safely remove
all the steps before them. See previous Moodle requirements issues as
example.

The upgrade steps deleted by this commit weren't using any stuff from
upgradelib, tasks..., so there isn't anything else to be removed but
the core steps themselves.

Also includes an upgrade step to prevent upgrading from any
version < 2021051708 (v3.11.8) as anti-cheating measure.
2023-02-03 19:48:02 +01:00
Eloy Lafuente (stronk7) c66dc59131 MDL-74905 environment: Apply agreed changes:
- PHP 8.0 required.
- Moodle 3.11.8 required (first minor supporting PHP 8.0 officially).
- MySQL 8.0 required.
- MariaDB 10.6.7 required.
- PostgreSQL 13 required.
- php-sodium extension required.
- 64-bit PHP required.
2023-02-03 19:48:02 +01:00
Eloy Lafuente (stronk7) 6667366b54 MDL-74905 environment: 4.2 base information
This is a direct copy of the 4.1 information, to
have all the real changes under control in next commit(s).
2023-02-03 19:48:02 +01:00
Eloy Lafuente (stronk7) 93406bd4f1 MDL-74905 composer: Regenerate with php80 and requirements raised
Now that the required PHP version has been raised to php80, set
it in the composer.json file and regenerate everything, following
the instructions @ https://docs.moodle.org/dev/Composer .

The only changes, as agreed in the issue are:
- Raise min PHP version to 8.0 (from 7.4).
- Make the php-sodium extension required (was optional).
- Small behat/behat bump to 3.12.0 (from 3.11.0)
2023-02-03 19:48:02 +01:00
Paul Holden 44d140d20c Merge branch 'MDL-76869-master' of https://github.com/cameron1729/moodle 2023-02-03 14:58:24 +00:00
Paul Holden 85bb12214d Merge branch 'MDL-77090' of https://github.com/timhunt/moodle 2023-02-03 14:46:48 +00:00
Paul Holden fe6db3e3b2 Merge branch 'MDL-76447-master' of https://github.com/meirzamoodle/moodle 2023-02-03 14:31:38 +00:00
Ferran Recio 9930b7a2e6 MDL-76783 core_courseformat: add bulk editing interface 2023-02-03 13:39:22 +01:00
Ferran Recio c9a8713539 MDL-76783 core_courseformat: add bulk state data 2023-02-03 12:24:59 +01:00
Ferran Recio 986ab2b84a MDL-76783 core_courseformat: add bulk-hidden classes 2023-02-03 12:24:59 +01:00
Ferran Recio cb85359b14 MDL-76783 theme_boost: sticky footer js control 2023-02-03 12:24:53 +01:00
Luca Bösch dda015f855 MDL-77112 quiz: Align some elements in quiz reports better. 2023-02-03 11:52:44 +01:00
Jun Pataleta 0780e87f06 weekly release 4.2dev 2023-02-03 15:43:31 +08:00
Angelia Dela Cruz 09dd28488a MDL-76499 behat: Resource Behat tests optimised
Replace steps that manually add resource instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.

Co-authored-by: David Woloszyn <david.woloszyn@moodle.com>
2023-02-03 11:02:26 +08:00
David Woloszyn 4004fd2963 MDL-75946 lib_horde: Fixed deprecated FILTER_SANITIZE_STRING 2023-02-03 12:56:36 +11:00
David Woloszyn e4bbca0401 MDL-75946 core_h5p: Fixed deprecated FILTER_SANITIZE_STRING 2023-02-03 12:56:35 +11:00
Jonathon Fowler d9bc9af91a MDL-74698 backup: correctly restore course format options
Old-version backups (< 3.11.7, < 4.0.1) lose their course-level format
options when restoring into newer versions after the backup structure
was changed.

Also, course-level format options were not accurately restored against
the appropriate format type. And section-level format options were
redundantly stored at course-level and restored without mapping their
sectionids, thus creating lint.
2023-02-03 10:17:05 +10:00
Tim Hunt 484828957a MDL-77090 questions: regrade of interactive attempts lose tries count
The behaviour-specific data was getting corrupted when the regrade
recreated the first step, because $oldstep->get_behaviour_data() was
stripping off the leading '-' characters from the names, and they were
not being added back.
2023-02-02 14:34:19 +00:00
Cameron Ball 02af9bd120 MDL-77123 message_airnotifier: Don't test configured providers 2023-02-02 14:10:01 +08:00
Jun Pataleta 3f0b0dccb1 Merge branch 'MDL-72609-master' of https://github.com/andrewnicols/moodle 2023-02-02 12:41:16 +08:00
Andrew Nicols 537706353b Merge branch 'MDL-75870-master' of https://github.com/nwp90/moodle 2023-02-02 12:38:49 +08:00
Andrew Nicols 8aa7812ff8 MDL-75085 external: Whitespace fix 2023-02-02 12:38:46 +08:00
David Woloszyn 23318ebb5e MDL-76755 admin: Blocked hosts defaults improved 2023-02-02 15:16:17 +11:00
Andrew Nicols 7ceb00f887 Merge branch 'MDL-75085-master-4' of https://github.com/junpataleta/moodle 2023-02-02 12:02:26 +08:00
Andrew Nicols 8360ac66f3 Merge branch 'MDL-75830-master' of https://github.com/andelacruz/moodle 2023-02-02 11:55:10 +08:00
Andrew Nicols cc44a3eea5 Merge branch 'MDL-77024' of https://github.com/timhunt/moodle 2023-02-02 11:51:51 +08:00
Andrew Nicols 11d09ef410 Merge branch 'MDL-76675' of https://github.com/stronk7/moodle 2023-02-02 11:02:21 +08:00
Andrew Nicols ba4adc5321 Merge branch 'MDL-76591' of https://github.com/paulholden/moodle 2023-02-02 11:00:29 +08:00
Jun Pataleta 8b88c61b70 Merge branch 'MDL-69690-master' of https://github.com/ilyatregubov/moodle 2023-02-02 10:35:02 +08:00
Ilya Tregubov a67e5f5496 Merge branch 'MDL-77058' of https://github.com/dravek/moodle 2023-02-02 10:05:20 +08:00
Jun Pataleta de4a2a1b9e Merge branch 'MDL-77092-master' of https://github.com/sammarshallou/moodle 2023-02-02 09:57:13 +08:00
Andrew Nicols 929e5b4552 Merge branch 'MDL-75912-master' of https://github.com/andelacruz/moodle 2023-02-02 09:49:05 +08:00
Ilya Tregubov 9c7e11c996 Merge branch 'MDL-77079-master' of https://github.com/lameze/moodle 2023-02-02 09:13:48 +08:00
Jun Pataleta 60fe64d786 MDL-75085 core_external: Validate $required param
Make sure that the $required param for external_description and its
subclasses are either VALUE_DEFAULT, VALUE_REQUIRED, or VALUE_OPTIONAL.
2023-02-02 09:13:43 +08:00
Jun Pataleta 7a85d041d7 MDL-75085 core_external: Pass proper $required param value in tests 2023-02-02 09:08:29 +08:00
Jun Pataleta a85c424204 MDL-75085 external: Fix external_multiple_structure parameter passing
Some calls to the external_multiple_structure's constructor incorrectly
pass parameters where the value for the $description parameter is not
being passed. This results to invalid values being passed for the
$required parameter.
2023-02-02 09:08:29 +08:00
Angelia Dela Cruz 710607ce5f MDL-75830 behat: Book behat tests optimised
Replace steps that manually add Book instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
Additionally, performed Behat cleanup and optimisation to affected
files.
2023-02-02 09:08:09 +08:00
Andrew Nicols 2f2c587552 Merge branch 'MDL-77100' of https://github.com/paulholden/moodle 2023-02-02 08:30:02 +08:00
Andrew Nicols b3469566ae Merge branch 'MDL-77001' of https://github.com/paulholden/moodle 2023-02-02 08:26:54 +08:00
Andrew Nicols 44fd686a2f Merge branch 'MDL-77003' of https://github.com/paulholden/moodle 2023-02-02 08:19:45 +08:00
Andrew Nicols 8ec42cd259 Merge branch 'MDL-75345' of https://github.com/paulholden/moodle 2023-02-02 08:17:42 +08:00
Nick Phillips 1435abde89 MDL-75870 course: only section togglers to toggle sections 2023-02-02 11:37:29 +13:00
Paul Holden d22142f537 Merge branch 'MDL-76658-master' of https://github.com/andelacruz/moodle 2023-02-01 16:34:36 +00:00
Paul Holden 147c31800b MDL-75345 reportbuilder: improve course/user custom report tests.
Ensure column and filters provided by each source have sufficient
coverage. Re-factor individual entity/helper class tests to test
their own specific implementation only.

Remove now-defunct test fixtures.
2023-02-01 15:41:32 +00:00
Paul Holden 5b644bfd30 MDL-77091 reportbuilder: set base time in schedule test generator.
The base time allows for the setting of the "current time" for the
purposes of the schedule test against recurrence configuration.

We should ensure the generator method allows this property so that
it can be used when calculating the initial "next send time" of the
schedule upon creation (and avoiding excessive recursion when the
actual current time is used for the calculation).
2023-02-01 14:39:21 +00:00
Paul Holden 8011dc68c6 Merge branch 'MDL-76311-master' of https://github.com/meirzamoodle/moodle 2023-02-01 14:16:11 +00:00
Meirza f249a04e93 MDL-76311 user: redirect to proper URL if a new user creation cancelled 2023-02-01 20:12:41 +07:00
Meirza 3f7981d480 MDL-76447 editor_tiny: revert the z-index.
Nesting the dropdown menu inside the parent DOM makes the menu can display correctly
without changing the z-index.
2023-02-01 17:33:22 +07:00
Meirza 83b5089e54 MDL-76447 editor_tiny: Nest the dropdown menu in the parent DOM.
The TinyMCE menu has a significant issue with the Overflow style,
and the Boost theme heavily uses Overflow for drawer navigation.
Nest the dropdown menu container into the parent editor container makes it work correctly.

Co-authored-by: davewoloszyn <david.woloszyn@moodle.com>
Co-authored-by: xr0master <xr0master@gmail.com>
2023-02-01 17:33:18 +07:00
Paul Holden f256b82879 Merge branch 'MDL-73847' of https://github.com/jonof/moodle 2023-02-01 10:00:22 +00:00
Sara Arjona cfac887beb Merge branch 'MDL-76135-patch' of https://github.com/ilyatregubov/moodle 2023-02-01 10:13:12 +01:00
Ilya Tregubov f3168a1bc7 MDL-76135 core: Remove old http-message lib 2023-02-01 16:41:18 +08:00
Paul Holden 25a6675fcd MDL-77102 mod_wiki: remove deprecated mbstring overload checks. 2023-02-01 08:32:10 +00:00
Ilya Tregubov 939ef5197a Merge branch 'MDL-76135-master' of https://github.com/safatshahin/moodle 2023-02-01 15:47:12 +08:00
Jun Pataleta a41eee1ba4 Merge branch 'MDL-76985-master' of https://github.com/sh-csg/moodle 2023-02-01 14:12:05 +08:00
Ilya Tregubov e2f539df20 Merge branch 'MDL-76587-master' of https://github.com/lameze/moodle 2023-02-01 13:25:18 +08:00
Jun Pataleta 2147bd6951 MDL-75085 webservice: Fix parameter passed to external_format_value 2023-02-01 11:12:02 +08:00
Angelia Dela Cruz 854a357add MDL-75912 behat: Wiki Behat tests optimised
Behat cleanup and optimisation
2023-02-01 11:01:47 +08:00
Angelia Dela Cruz 77cb8e55e4 MDL-75912 behat: Wiki Behat tests now use generators
Replace steps that manually add Wiki instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2023-02-01 11:00:57 +08:00
Simey Lameze af00222947 MDL-77079 behat: use different step to validate presets table data 2023-02-01 09:01:56 +08:00
guillermogomez 43c64bc141 MDL-77062 reportbuilder: Add filters/conditions for completion entity
This commit will add missing fields as Time enrolled/started/reaggregated
in the filter/condition area for the completion entity when creating a course participants
as a report source in the Report Builder.
2023-01-31 18:37:44 -05:00
Paul Holden 0f58d46b05 MDL-77100 mod_data: replace calls to str_ends_with, fix assertions.
Calls to `str_ends_with` are polyfilled currently, as the method is
not present in PHP7.4 or earlier. We should avoid uses of it so as
to not trip up compatibility standard checkers.
2023-01-31 21:35:33 +00:00
Tim Hunt c60878c90d MDL-77094 quiz_statistics: improve efficiency of the recalculate task
quiz_settings::create() requires at least 3 DB queries, so the point is
that we can avoid doing that until after we have worked out if we need
to calculate statistics for this quiz.

Also, we order the list of quizzes to consier, to process the ones with
more recent attempts first.
2023-01-31 15:58:48 +00:00
Julien Boulen 07193bcb00 MDL-76945 theme: fix the rendering of arrows on dropdown variants 2023-01-31 15:17:15 +01:00
Andrew Nicols 2b6224a345 Merge branch 'MDL-75945-master' of https://github.com/meirzamoodle/moodle 2023-01-31 22:12:16 +08:00
sam marshall b639c1455a MDL-77092 Behat: Expand all fieldsets fails with single fieldset
The Behat step to expand all fieldsets did not work if the page
contains only one fieldset.
2023-01-31 13:56:04 +00:00
Andrew Nicols 58afba6d82 Merge branch 'MDL-77081' of https://github.com/paulholden/moodle 2023-01-31 21:43:01 +08:00
Angelia Dela Cruz 7bc1079332 MDL-76658 Behat: Coverage for course cohort enrolment groups
Co-authored-by: Simey Lameze <simey@moodle.com>
2023-01-31 21:18:31 +08:00
Paul Holden 16747048f3 MDL-77081 forms: PHP8.1 compatibility for group/textarea elements.
See related changes in b0a83aa7, we can no longer pass null values
to some string related methods.
2023-01-31 10:51:24 +00:00
Ilya Tregubov 2ed4132539 Merge branch 'MDL-77077-master' of https://github.com/snake/moodle 2023-01-31 18:13:10 +08:00
hieuvu 1912982e95 MDL-76904 question: Keep question highlight in url 2023-01-31 16:33:32 +07:00
Andrew Nicols 1f4794341b Merge branch 'MDL-75498-master' of https://github.com/ferranrecio/moodle 2023-01-31 15:13:33 +08:00
Simey Lameze f93b2f3992 MDL-76587 behat: make grading page wider to avoid 'out of bounds' fail
This is because on classic theme the navigation block pushes the content
to the right and once behat changes the grades the 'Save changes' button
is no longer visible.
2023-01-31 11:14:51 +08:00
Paul Holden 76327f04ac MDL-76591 comment: create test generators and Behat scenarios.
The added scenarios cover the management of comments: viewing,
filtering and deletion.
2023-01-30 16:00:25 +00:00
Paul Holden 35f3847064 MDL-76591 comment: implement new management interface elements.
Convert existing JS modules, call existing external service for
comment deletion.
2023-01-30 15:54:00 +00:00
Paul Holden 648b80c201 MDL-76591 comment: convert existing overview page to system report.
Re-use the entity definitions previously created in fdf2f8f3 for
custom reporting, to create a new system report class.
2023-01-30 15:53:59 +00:00
Charles Fulton 63305c402a MDL-75578 course: require course library to resolve namespace issues 2023-01-30 10:43:09 -05:00
Ferran Recio cde3565a67 MDL-75498 mod_data: add new tags to presets 2023-01-30 12:01:22 +01:00
Ferran Recio 0213df2f03 MDL-75498 mod_data: add extra tags to templates 2023-01-30 12:01:20 +01:00
Paul Holden 1d21409158 MDL-76912 libraries: upgrade to version 1.8.1 of loglevel. 2023-01-30 09:58:53 +00:00
Jake Dallimore 9981e1ec2e MDL-77077 mod_lti: Fix JWT signature verify when alg missing from JWKS
Infer the algorithm, where necessary, using a combination of JWT
headers and known valid LTI algorithms.
2023-01-30 16:44:23 +08:00
Andrew Nicols ce548692ac Merge branch 'MDL-77040' of https://github.com/paulholden/moodle 2023-01-30 12:22:28 +08:00
Andrew Nicols edd1fa9218 Merge branch 'MDL-76933' of https://github.com/paulholden/moodle 2023-01-30 11:25:27 +08:00
Andrew Nicols 9bdeb2c012 Merge branch 'MDL-76357-master' of https://github.com/aanabit/moodle 2023-01-30 11:20:32 +08:00
Safat e2d4a543b0 MDL-76135 core: Implement Guzzle cache middleware 2023-01-30 13:05:27 +11:00
Safat 59a9987719 MDL-76135 core: Add guzzle cache middleware 2023-01-30 13:05:27 +11:00
Safat 7c5363eed3 MDL-76135 core: Implement the Guzzle library in core
This commit will implement the Guzzle library in core
to make it usable in different locations.

Co-Authored-By: Andrew Nicols <andrew@nicols.co.uk>
Co-Authored-By: Safat Shahin <safat.shahin@moodle.com>
2023-01-30 13:05:27 +11:00
Andrew Nicols 7b150add44 MDL-76135 core: Import the Guzzle library
This commit will import the Guzzle library in
core. The imported libraries will be used in
the next commits to create an api for the http
client to be used in relevant locations.

Co-Authored-By: Andrew Nicols <andrew@nicols.co.uk>
Co-Authored-By: Safat Shahin <safat.shahin@moodle.com>
2023-01-30 13:05:27 +11:00
Tim Hunt a344e7a3b4 MDL-77018 qbank_statistics: only load stats for contexts that exist
Also, pre-load the contexts for efficiency.
2023-01-27 20:51:05 +00:00
David Matamoros cf86329c7a MDL-77058 reportbuilder: Fix for cohort null idnumber column 2023-01-27 13:53:44 +01:00
Paul Holden fdc9bd1a76 MDL-77057 group: format group names in module override pages. 2023-01-27 11:50:58 +00:00
Tim Hunt 34ca197526 MDL-77024 quiz: fix metatdata on log events
Some had the wrong edulevel or crud
2023-01-27 11:30:28 +00:00
Andrew Nicols f570647d67 Merge branch 'MDL-76562-master' of https://github.com/meirzamoodle/moodle 2023-01-27 13:13:23 +08:00
Andrew Nicols 7bf34d9982 Merge branch 'MDL-75978-master' of https://github.com/JBThong/moodle 2023-01-27 12:24:53 +08:00
Laurent David caecb565c8 MDL-75688 mod_bigbluebuttonbn: Add indexes to log table
* The compound index courseid,bigbluebuttonid is useful to add in order
to speed up some of the queries on the bigbluebuttonbn_logs table
2023-01-26 16:47:42 +01:00
Paul Holden 7f59718891 MDL-77040 core: assert types of returned Geoplugin data, not values.
The results we get from these tests are beyond our control, and are
unreliable for use in testing.

See also previous change 215cd2d8 in similar tests.
2023-01-26 13:24:00 +00:00
Eloy Lafuente (stronk7) 0cbf52d3f4 MDL-76675 date: Only test all TZ names with PHPUNIT_LONGTEST enabled
It happens often that some timezone is renamed, split, added to the
IANAs list of timezones (that, for PHP is kept updated by the
php-timezonedb PECL extension).

When the information coming from the extension changes, all the
PHPUnit jobs in the world start failing (that's when CIs update
their PHP images, when devs update their packages, ...).

So, what we are doing here is to move that test that check for
every single string existing to be run only when PHPUNIT_LONGTEST
is enabled. That way only places running all tests will run that
one. And every other run just will skip it.

This corresponds to point 1 & 2 of the issue, lower impact in general
and, still be able to enable the tests to run.
2023-01-26 14:18:29 +01:00
Paul Holden ebb277ecf5 MDL-76662 tool_log: correct supported reports test assertions. 2023-01-26 13:09:21 +00:00
Davo Smith b395c3f63b MDL-76938 backup: fix restore of comments linked to a course format 2023-01-26 12:31:13 +00:00
Amaia Anabitarte a58ea07a41 MDL-76357 theme: Make sticky footer more prominent 2023-01-26 13:11:18 +01:00
Sara Arjona 880462a168 weekly release 4.2dev 2023-01-26 09:59:06 +01:00
Paul Holden 723b01e416 MDL-77042 mod_data: fix empty/zero equality check for numeric field. 2023-01-25 16:57:58 +00:00
Jun Pataleta f15855ecd6 Merge branch 'MDL-76977' of https://github.com/paulholden/moodle 2023-01-25 16:10:28 +08:00
Jun Pataleta c0bdbf327c Merge branch 'MDL-77036-master' of https://github.com/lameze/moodle 2023-01-25 16:02:37 +08:00
Stefan Hanauska 4b5714fa6a MDL-76985 course: Redirect to moved section 2023-01-25 08:58:53 +01:00
Jun Pataleta 8c3cb3d17e Merge branch 'MDL-77027-master' of https://github.com/andrewnicols/moodle 2023-01-25 15:33:52 +08:00
Sara Arjona 47fd608156 Merge branch 'MDL-76968-master' of https://github.com/junpataleta/moodle 2023-01-25 08:22:23 +01:00
Simey Lameze 6510a7d9ba MDL-77036 core_iplookup: update test_ipv4 test expectations 2023-01-25 15:11:52 +08:00
Andrew Nicols 8fb8bfaf35 MDL-77007 auth: Remove auth-yui-passwordunmask
This was used as part of the auth_config.php configuration system for
the auth subsystem, which was deprecated in Moodle 3.3.

It has never had any other uses in core.

Whilst it would be ideal to deprecate it by replacing with an
alternative, it would be impossible to test.
2023-01-25 14:14:15 +08:00
Andrew Nicols 6a5512c999 MDL-77007 admin: Remove deprecated auth_config.php usage
This was deprecated in Moodle 3.3 and should now be removed.
2023-01-25 14:13:59 +08:00
Andrew Nicols a72168741c MDL-77027 webservice: Add missing class requires 2023-01-25 11:14:59 +08:00
Jun Pataleta f3c29eab3d Merge branch 'MDL-76967-master' of https://github.com/lucaboesch/moodle 2023-01-25 08:57:24 +08:00
Paul Holden ea0515758a MDL-77003 javascript: improve string helper JSON detection.
Changes in fbc2732d made the JS template string helper method
too strict in regards to what it considers a valid JSON object.

Co-authored-by: Mike Churchward <mike@brickfieldlabs.ie>
2023-01-24 22:14:12 +00:00
Paul Holden c4b07bdadf MDL-77023 javascript: always normalise component of lang strings.
Co-authored-by: David Matamoros <davidmc@moodle.com>
2023-01-24 16:29:22 +00:00
Jun Pataleta ce9f6db2ff Merge branch 'MDL-76899' of https://github.com/timhunt/moodle 2023-01-24 23:19:43 +08:00
Sara Arjona ae53d04144 Merge branch 'MDL-75337-master' of https://github.com/laurentdavid/moodle 2023-01-24 16:07:35 +01:00
Jun Pataleta ebbcfa9164 Merge branch 'MDL-76430-master' of https://github.com/ferranrecio/moodle 2023-01-24 21:03:28 +08:00
Ferran Recio d770ebd01b MDL-76430 core_courseformat: implement fragment to course format 2023-01-24 12:00:11 +01:00
Jun Pataleta e742e21800 Merge branch 'MDL-76639-master' of https://github.com/andelacruz/moodle 2023-01-24 18:59:38 +08:00
Jun Pataleta 5587484e3c Merge branch 'MDL-76652-master' of https://github.com/lameze/moodle 2023-01-24 18:45:46 +08:00
Jun Pataleta 29c59bab1f Merge branch 'MDL-76655-master' of https://github.com/andelacruz/moodle 2023-01-24 18:27:10 +08:00
Meirza bf3a9c3b3f MDL-75945 core: Convert a floating value to an integer.
In PHP 8.1, any implicit conversion of float to int, which leads to a loss in precision, is now deprecated.
To avoid the error warning, the code must explicitly convert a floating value to an integer.
2023-01-24 16:49:10 +07:00
Andrew Nicols b1f844750b MDL-77009 tool_monitor: Replace YUI dropdown with ESM version 2023-01-24 16:22:07 +08:00
Andrew Nicols 84929c01f7 MDL-77007 core_form: Remove deprecated moodle-form-passwordunmask 2023-01-24 15:08:50 +08:00
Jun Pataleta 9ed08abd3b Merge branch 'MDL-76973' of https://github.com/paulholden/moodle 2023-01-24 14:02:56 +08:00
Laurent David 9686196e91 MDL-75337 mod_data: Single button - mod_data changes
* Update mod_data module to use the new button style
2023-01-24 06:01:35 +01:00
Laurent David fc72a1d7b1 MDL-75337 core: Single button - core changes
* Change all core calls toward single_button to use single_button::BUTTON_PRIMARY
    when needed
2023-01-24 06:01:35 +01:00
Andrew Nicols ecc2a8775a Merge branch 'MDL-69164-master' of https://github.com/JBThong/moodle 2023-01-24 11:45:27 +08:00
Jun Pataleta da144479fb Merge branch 'MDL-76362-master-extra' of https://github.com/andrewnicols/moodle 2023-01-24 10:38:55 +08:00
Jun Pataleta bcfed4c920 Merge branch 'MDL-76987-master' of https://github.com/andrewnicols/moodle 2023-01-24 09:03:09 +08:00
Angelia Dela Cruz 2cd327b16f MDL-76655 behat: Coverage for workshop grading strategies 2023-01-24 08:48:08 +08:00
Paul Holden 363942cbb6 MDL-76354 competency: export user privacy data unconditionally.
We should ensure that any past competency data for a user is always
exported, regardless whether competencies are currently enabled.
2023-01-23 22:14:22 +00:00
Paul Holden 89be8b7c78 MDL-77001 tiny_autosave: use valid lang string during privacy export. 2023-01-23 22:05:45 +00:00
Amaia Anabitarte d4e66f1df5 MDL-76066 mod_data: Trigger field_deleted event when importing 2023-01-23 18:53:44 +01:00
Laurent David 377c962f11 MDL-75337 core: Single button - API changes
* Update component library for new features of single_button and modal
    * Update core_notification javascript
2023-01-23 13:45:21 +01:00
Andrew Nicols 5e33d57dbe MDL-76987 webservice: Correct namespace for external_api 2023-01-23 20:37:05 +08:00
Paul Holden 89db417402 MDL-76584 question: correct temporary questionid upgrade field.
Pass correct parameter/type in field constructor (`XMLDB_NOTNULL`)
for consistency. This corrects the definition and preserves the
truthyness of the value that was incorrectly passed previously.
2023-01-23 09:16:48 +00:00
Andrew Nicols fcad49b03b MDL-72609 core: Remove YUI from M.util.pendingJS 2023-01-23 15:02:55 +08:00
Andrew Nicols b8f6b7602b MDL-72609 core: Fix complete_js to be a list of strings 2023-01-23 15:02:55 +08:00
Andrew Nicols 116ddb8933 MDL-72609 behat: Rewrite core/pending to observe ES6 style
This commit makes the following changes:
* convert to use ES6 module format
* migrate from a jQuery Deferred to a native ES6 promise
* add a native-Promise-like instantiation

New uses are documented in appropriate jsdoc with examples.
2023-01-23 15:02:55 +08:00
Eloy Lafuente (stronk7) 7fa7d4dd2a MDL-76362 workshop: check for empty (null included) feedbackreviewer
As far as feedbackreviewer can be null, we cannot, since PHP 8.1
apply any string operation (trim, strlen...) on it, hence, checking
before applying.
2023-01-23 09:17:48 +08:00
Eloy Lafuente (stronk7) 240b193603 MDL-76362 enrol_lti: Prevent calling to DataConnector with null keys
While it could have been fixed in DataConnector (3rd part lib), better
prevent in our code to call to it with null keys.

Covered by unit tests.
2023-01-23 09:17:48 +08:00
Eloy Lafuente (stronk7) 4a76c772d7 MDL-76362 output: Preserve original behaviour for PHP 8.1
Whenever the page_requirements_manager::js_fix_url()
is called with null url, it must throw an exception and emit 0 warnings.

It's covered by an explicit test:

test_js_fix_url_coding_exception with data set "Provide a null argument"
2023-01-23 09:17:48 +08:00
Andrew Nicols 7000a99de3 MDL-76362 core: Coding style fixes 2023-01-23 09:15:55 +08:00
Andrew Nicols ce85ef1e49 MDL-76362 core_privacy: Shortcircuit URL rewriting on empty content 2023-01-23 09:15:55 +08:00
Andrew Nicols 5d3cb79f30 MDL-76362 core: Short circuit s() on empty values 2023-01-23 09:15:55 +08:00
Andrew Nicols 19bedb8eba MDL-76362 core: Short-circuit strip_querystring on empty values 2023-01-23 09:15:55 +08:00
Andrew Nicols b0aa0b63e0 MDL-76362 core_file: Check prefix exists before checking length 2023-01-23 09:15:55 +08:00
Andrew Nicols 93ab932211 MDL-76362 core: plugin names must be strings to be valid 2023-01-23 09:15:55 +08:00
Andrew Nicols e068f2284f MDL-76362 core: Update core_component plugin name tests 2023-01-23 09:15:55 +08:00
Andrew Nicols eceb3c49fd MDL-76362 core: Test coursealias before using 2023-01-23 09:15:55 +08:00
Andrew Nicols 6ae3f79c1e MDL-76362 h5p: Use string as default lang param 2023-01-23 09:15:55 +08:00
Andrew Nicols e76b1bcd5e MDL-76362 qtype_numerical: Fix bug in phpdoc 2023-01-23 09:15:54 +08:00
Andrew Nicols 771b49c9ac MDL-76362 qtype_calculated*: Address issues with null strings 2023-01-23 09:15:54 +08:00
Andrew Nicols b7710dbaf4 MDL-76362 qtype: Update formatting of qtype_calculated* upgradelib 2023-01-23 09:15:54 +08:00
Andrew Nicols b4103db72e MDL-76362 qtype_numerical: Support empty units for apply_units 2023-01-23 09:15:54 +08:00
Andrew Nicols 913430f144 MDL-76362 qtype_numeric: Refactor answer tests 2023-01-23 09:15:54 +08:00
Andrew Nicols 32b45433bb MDL-76362 question: Add test for number(null) 2023-01-23 09:15:54 +08:00
Andrew Nicols 5c2d98efcd MDL-76362 question: Refactor question number unit tests 2023-01-23 09:15:54 +08:00
Andrew Nicols ef09257dc1 MDL-76362 core: Use empty default string when getting prefs
The json_decode function does not accept a null, which is the
traditional default for get_user_preferences. By passing a default of
am empty string we avoid issues in PHP 8.1.
2023-01-23 09:15:54 +08:00
Marina Glancy b0a83aa7bd MDL-76362 various: Avoid passing nulls to functions that don't allow nulls
PHP 8.1 is more strict on the parameter type. Functions such as trim(), strlen(), str_replace(), etc
show notice when null is passed as an argument
2023-01-23 09:15:54 +08:00
Marina Glancy 491ed7b200 MDL-76362 mustache: Override parent method to avoid PHP notices
Parent method checks baseDir that is null in this case. This shows notices under PHP 8.1
2023-01-23 09:15:54 +08:00
Paul Holden 5414b82e6e MDL-76977 phpunit: ensure unique data provider keys in mustache test. 2023-01-20 17:19:16 +00:00
Sara Arjona 7c56b6900e Merge branch 'MDL-76942-master-2' of https://github.com/junpataleta/moodle 2023-01-20 16:20:09 +01:00
Sara Arjona 3c649386da Merge branch 'MDL-76139-master' of https://github.com/kevpercy/moodle 2023-01-20 16:11:54 +01:00
Jun Pataleta b60cb734b7 MDL-76942 course: Adjust activity chooser Behat tests
* Try to use the button name instead of CSS selectors whenever possible.
2023-01-20 21:27:39 +08:00
Jun Pataleta 544656431a MDL-76942 core: Revert change to insertresourceoractivitybefore
Revert the lang string "Add an activity or resource before [xx]" back to
its original form of "Insert an activity or resource before [xx]" in
order to avoid conflicts with the "Add an activity or resource" button
especially when running Behat tests.
2023-01-20 21:27:39 +08:00
Andrew Nicols 5b2e04f301 MDL-75945 core: Update uses of ImagePolygon
A new signature was introduced to ImagePolygon functions from PHP 8.0
with the previous signature deprecated in 8.1.

For PHP versions 8.0 and later we should use the new signature. Once PHP
8.0 is the required minimum version, the legacy version should be
removed.
2023-01-20 18:41:26 +07:00
Paul Holden 1b52486cce MDL-76973 user: correct testcase reference to external_api class. 2023-01-20 11:30:02 +00:00
Paul Holden ab670ab286 MDL-76933 badges: create user-focused datasource for custom reporting.
This report source differs from the original badges source (5274ee5a)
by making `user` the primary table of the report, allowing for reports
on all users regardless of whether they have been awarded badges.
2023-01-20 10:20:01 +00:00
Paul Holden 75ab52d902 MDL-76878 user: amend permission callbacks for preference definitions.
Ensure those preferences that are used for storing state can always be
updated via web service requests for the current user.
2023-01-20 10:05:21 +00:00
Jun Pataleta a479c1854b MDL-76968 mod_quiz: Use proper external_api reference 2023-01-20 17:06:17 +08:00
Luca Bösch a4eee48b49 MDL-76967 questions: Questions last used line height 2023-01-20 09:56:55 +01:00
Kevin Percy 567214a500 MDL-76139 gradebook_grader: Move group selector to tertiary navigation 2023-01-20 13:08:59 +08:00
Jaydn Cunningham 6ad6b28a34 MDL-76370 curl: suppress CONNECT header when using HTTP proxy 2023-01-20 14:26:30 +10:30
Meirza ec805cd575 MDL-76562 editor_tiny: Added functions to remove button/menu/submenu.
Added a few functions to remove the toolbar button, menubar and sub-menu items.
One of the implementations is to remove the justify alignment in the toolbar and
the sub-menu items to aid the accessibility aspect of the TinyMCE editor.
2023-01-20 09:57:52 +07:00
Ilya Tregubov df502b3e4c weekly release 4.2dev 2023-01-20 09:41:37 +08:00
sam marshall 100e38fe38 MDL-76956 core_grades: Regrade progress bar should be more granular
This change makes the regrade progress bar send frequent updates to
the web browser, even when processing within the same grade item, to
avoid timeout problems when there are a large number of users.
2023-01-19 16:43:51 +00:00
Jun Pataleta 4e8aee01fe Merge branch 'MDL-76725' of https://github.com/paulholden/moodle 2023-01-19 12:05:12 +08:00
Jun Pataleta 317af68140 Merge branch 'MDL-76537' of https://github.com/stronk7/moodle 2023-01-19 11:24:04 +08:00
Jun Pataleta 6538b400df Merge branch 'MDL-76583-master-withoutrename' of https://github.com/andrewnicols/moodle 2023-01-19 11:18:43 +08:00
Ilya Tregubov 42a2b973ce Merge branch 'MDL-76870-master' of https://github.com/lameze/moodle 2023-01-19 11:14:46 +08:00
Ilya Tregubov 89b722402e Merge branch 'MDL-76766-master' of https://github.com/aanabit/moodle 2023-01-19 11:03:40 +08:00
Andrew Nicols fcbad1f68a MDL-76583 external: Add unit test for deprecated test helper 2023-01-19 11:02:31 +08:00
Ilya Tregubov 385721f022 Merge branch 'MDL-74756-master' of https://github.com/sh-csg/moodle 2023-01-19 10:29:35 +08:00
Jun Pataleta fad05d7929 Merge branch 'MDL-76583-master-withoutrename' of https://github.com/andrewnicols/moodle 2023-01-19 09:44:48 +08:00
Andrew Nicols 46eb8da969 Merge branch 'MDL-69643' of https://github.com/paulholden/moodle 2023-01-19 09:05:46 +08:00
Andrew Nicols 853f07d4c0 Merge branch 'MDL-69127' of https://github.com/paulholden/moodle 2023-01-19 09:01:39 +08:00
Andrew Nicols 5abb018103 Merge branch 'MDL-69126' of https://github.com/paulholden/moodle 2023-01-19 08:58:01 +08:00
Andrew Nicols b56a9b9004 Merge branch 'MDL-76841' of https://github.com/paulholden/moodle 2023-01-19 08:54:07 +08:00
Andrew Nicols 3731f4e263 Merge branch 'MDL-70070' of https://github.com/paulholden/moodle 2023-01-19 08:47:51 +08:00
Andrew Nicols 1dbc7b303e MDL-76583 core_external: Update util_test coding style 2023-01-19 07:34:09 +08:00
Andrew Nicols a3cc26f8bb MDL-76583 core: Update uses of external_* classes 2023-01-19 07:34:09 +08:00
Andrew Nicols 3e1920966c MDL-76583 core_external: Note deprecations and renames 2023-01-19 07:34:00 +08:00
Andrew Nicols 188dfcbf8c MDL-76583 core_external: External API Test coding style fixes 2023-01-19 07:33:47 +08:00
Andrew Nicols c435f5d95b MDL-76583 core_external: Update service management functions 2023-01-19 07:33:47 +08:00
Andrew Nicols 47814221e5 MDL-76583 core_external: Update util string formatting functions 2023-01-19 07:33:47 +08:00
Andrew Nicols d5d4ff8986 MDL-76583 core_external: Update token functions 2023-01-19 07:33:47 +08:00
Andrew Nicols 7a4f57cbfa MDL-76583 core_external: util class coding style fixes 2023-01-19 07:33:47 +08:00
Andrew Nicols 93d0f2f2c1 MDL-76583 core_external: external_files coding style fixes 2023-01-19 07:33:47 +08:00
Andrew Nicols be1c3877c5 MDL-76583 core_external: external_value coding style fixes 2023-01-19 07:33:47 +08:00
Andrew Nicols 1125fa94f6 MDL-76583 core_external: external_format_value coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols b46a72c1aa MDL-76583 core_external: external_single_structure coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols 135fae604c MDL-76583 core_external: external_multiple_structure coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols 8e336beac3 MDL-76583 core_external: external_function_params coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols 59c9577912 MDL-76583 core_external: external_warnings coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols 6325775551 MDL-76583 core_external: external_api unit tests coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols ca7305f0c6 MDL-76583 core_external: external_description coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols 8bc2011d3d MDL-76583 core_external: external settings coding style fixes 2023-01-19 07:33:46 +08:00
Andrew Nicols c978cd8cc3 MDL-76583 core_external: core_external\external_api coding style fixes 2023-01-19 07:33:38 +08:00
Andrew Nicols fa676b4776 MDL-76583 core_external: Implement Privacy API for core_external
AMOS BEGIN
 MOV [privacy:metadata:serviceusers,core_webservice],[privacy:metadata:serviceusers,core_external]
 MOV [privacy:metadata:serviceusers:iprestriction,core_webservice],[privacy:metadata:serviceusers:iprestriction,core_external]
 MOV [privacy:metadata:serviceusers:timecreated,core_webservice],[privacy:metadata:serviceusers:timecreated,core_external]
 MOV [privacy:metadata:serviceusers:userid,core_webservice],[privacy:metadata:serviceusers:userid,core_external]
 MOV [privacy:metadata:serviceusers:validuntil,core_webservice],[privacy:metadata:serviceusers:validuntil,core_external]
 MOV [privacy:metadata:tokens,core_webservice],[privacy:metadata:tokens,core_external]
 MOV [privacy:metadata:tokens:creatorid,core_webservice],[privacy:metadata:tokens:creatorid,core_external]
 MOV [privacy:metadata:tokens:iprestriction,core_webservice],[privacy:metadata:tokens:iprestriction,core_external]
 MOV [privacy:metadata:tokens:lastaccess,core_webservice],[privacy:metadata:tokens:lastaccess,core_external]
 MOV [privacy:metadata:tokens:privatetoken,core_webservice],[privacy:metadata:tokens:privatetoken,core_external]
 MOV [privacy:metadata:tokens:timecreated,core_webservice],[privacy:metadata:tokens:timecreated,core_external]
 MOV [privacy:metadata:tokens:token,core_webservice],[privacy:metadata:tokens:token,core_external]
 MOV [privacy:metadata:tokens:tokentype,core_webservice],[privacy:metadata:tokens:tokentype,core_external]
 MOV [privacy:metadata:tokens:userid,core_webservice],[privacy:metadata:tokens:userid,core_external]
 MOV [privacy:metadata:tokens:validuntil,core_webservice],[privacy:metadata:tokens:validuntil,core_external]
 MOV [privacy:request:notexportedsecurity,core_webservice],[privacy:request:notexportedsecurity,core_external]
AMOS END
2023-01-19 07:33:35 +08:00
Andrew Nicols 0392551bcb MDL-76583 core_external: Migrate service management to util 2023-01-19 07:33:35 +08:00
Andrew Nicols caddb452f0 MDL-76583 core_external: Migrate string formatting functions to util 2023-01-19 07:33:35 +08:00
Andrew Nicols 7f5fb6a592 MDL-76583 core_external: Migrate token functions class 2023-01-19 07:33:35 +08:00
Andrew Nicols 7d079e82e1 MDL-76583 core_external: Move util test and update 2023-01-19 07:33:35 +08:00
Andrew Nicols 453738e3fd MDL-76583 core_external: Move files test and update 2023-01-19 07:33:35 +08:00
Andrew Nicols 3f8fdc8e33 MDL-76583 core_external: Move settings test and update 2023-01-19 07:33:35 +08:00
Andrew Nicols ecbb31b160 MDL-76583 core_external: Migrate external_settings class 2023-01-19 07:33:35 +08:00
Andrew Nicols e460e2e43f MDL-76583 core_external: Migrate external_format_value class 2023-01-19 07:33:35 +08:00
Andrew Nicols 780ba1333b MDL-76583 core_external: Migrate external_warnings class 2023-01-19 07:33:35 +08:00
Andrew Nicols c42831cec6 MDL-76583 core_external: Migrate external_files class 2023-01-19 07:33:35 +08:00
Andrew Nicols ebbf342127 MDL-76583 core_external: Migrate external_util class 2023-01-19 07:33:35 +08:00
Andrew Nicols fff2c7420f MDL-76583 core_external: Migrate restricted_context_exception class 2023-01-19 07:33:35 +08:00
Andrew Nicols 698f06edeb MDL-76583 core_external: Migrate external_function_parameters class 2023-01-19 07:33:35 +08:00
Andrew Nicols 279ae4d5b3 MDL-76583 core_external: Migrate external_multiple_structure class 2023-01-19 07:33:35 +08:00
Andrew Nicols 967bed2954 MDL-76583 core_external: Migrate external_single_structure class 2023-01-19 07:33:34 +08:00
Andrew Nicols 61d59eaa11 MDL-76583 core_external: Migrate external_value class 2023-01-19 07:33:34 +08:00
Andrew Nicols 6f185f1873 MDL-76583 core_external: Migrate external_description class 2023-01-19 07:33:34 +08:00
Andrew Nicols cdd51a663b MDL-76583 core_external: Move external_api unit tests 2023-01-19 07:33:34 +08:00
Andrew Nicols 56bcaf409f MDL-76583 core_external: Migrate external_api to core_external\external_api 2023-01-19 07:33:18 +08:00
Lars Bonczek 9ed7a8ebae MDL-76948 mod_assign: Fix description of submission_unlocked event 2023-01-18 16:25:58 +01:00
Jun Pataleta 0f1a005017 Merge branch 'MDL-76525-master' of https://github.com/PhMemmel/moodle 2023-01-18 22:56:09 +08:00
Tim Hunt ec0a2dd85b MDL-76899 quiz: Fix PHPdocs issues 2023-01-18 12:14:37 +00:00
Philipp Memmel 4f4fbea9c3 MDL-76525 mod_data: Add param validation for data fields 2023-01-18 12:09:07 +01:00
Ilya Tregubov ec5e09b393 Merge branch 'MDL-55929-master' of https://github.com/srobotta/moodle 2023-01-18 14:18:53 +08:00
Tien Nguyen 5863659d79 MDL-69164 Question: Convert question/qengine.js to AMD modules 2023-01-18 11:24:38 +07:00
Andrew Nicols f9a3ec96b6 Merge branch 'MDL-76898' of https://github.com/timhunt/moodle 2023-01-18 11:10:29 +08:00
Claude Vervoort e56fec2662 MDL-76602 mod_lti: move lti13 claim declaration in subplugin 2023-01-17 16:51:32 -05:00
Stephan Robotta 0c8f9108c2 MDL-55929 assign: allow bulk emails in assignment userslist 2023-01-17 10:12:50 +01:00
Jake Dallimore 9681ec4693 Merge branch 'MDL-66221-master' of https://github.com/raortegar/moodle 2023-01-17 11:28:40 +08:00
Andrew Nicols 4a2793002c MDL-76583 core_external: Add new core_external subsystem 2023-01-17 10:59:15 +08:00
Stefan Hanauska a9149c13af MDL-74756 availability_completion: Prev activity (completion n/enabled) 2023-01-16 22:20:48 +01:00
Tim Hunt 28f090d975 MDL-76899 quiz: fix whitespace around operators 2023-01-16 19:07:08 +00:00
Tim Hunt 2bb6c8b281 MDL-76899 quiz: bulk fix all array literals array() -> []
This was done with PHPStorm's automated tool. No manual editing
2023-01-16 17:12:45 +00:00
Tim Hunt 17e11dd9d5 MDL-76899 quiz: Bulk fix object -> stdClass in PHPdoc 2023-01-16 17:12:44 +00:00
Tim Hunt 450e55e79d MDL-76899 quiz: remove unneeded tearDown from a unit test 2023-01-16 17:12:34 +00:00
Tim Hunt f4099bcd78 MDL-76899 quiz: basic cleanup of the structure and repaginate classes 2023-01-16 17:12:23 +00:00
Tim Hunt 6e7c63b36f MDL-76898 quiz: Move deprecated functions deprecatedlib.php
These were already deprecated, but in the wrong file.
2023-01-16 17:12:15 +00:00
Tim Hunt 03cf2ce782 MDL-76898 quiz: final deprecation of things deprecated long ago 2023-01-16 17:12:02 +00:00
Sara Arjona d62f6ae036 Merge branch 'MDL-61789-master' of https://github.com/meirzamoodle/moodle 2023-01-16 17:08:38 +01:00
Sara Arjona 574f68f014 Merge branch 'MDL-76219-master' of https://github.com/meirzamoodle/moodle 2023-01-16 16:45:00 +01:00
Brendan Heywood d561d97273 MDL-76478 formslib: Fix autocomplete bug of existing passwords 2023-01-16 22:58:07 +11:00
Paul Holden fd8d11b704 MDL-76841 tool_mobile: improve potential config issues test.
Avoid certificate checking of the default test site (`example.com`),
and update the assertion so we get clearer failures in the future.
2023-01-16 08:30:49 +00:00
Paul Holden af8da7c737 MDL-70070 phpunit: correct data provider method names.
They should not be prefixed `test_` because that's how actual
test methods containing assertions are identified by PHPUnit.
2023-01-16 08:28:37 +00:00
Kevin Pham 0072559aa7 MDL-72559 cache: core/plugin_functions cache can be local
Co-Authored-By: Tim Hunt <T.J.Hunt@open.ac.uk>
2023-01-16 16:29:48 +11:00
Jun Pataleta dd0580d809 Merge branch 'MDL-76377-master' of https://github.com/aanabit/moodle 2023-01-16 09:40:07 +08:00
Jun Pataleta aedbfba858 Merge branch 'MDL-76358-master' of https://github.com/laurentdavid/moodle 2023-01-16 09:32:56 +08:00
Jonathon Fowler c9fe46fe3d MDL-73847 lti: fetch keyset URLs using configured proxy settings 2023-01-16 10:00:17 +10:00
raortegar afb4a9effd MDL-66221 tool_recyclebin: Fix recycle bin with activity settings
If backup_auto_activities setting from Automated backup is disabled
the activities will not be stored for the recycle bin
2023-01-13 11:30:54 +01:00
Simey Lameze bb0aeafb25 MDL-76870 question: change assertion to assertEqualsCanonicalizing
By using that assertion the arrays will be sorted before comparison
preventing any Oracle sorting related failures.

Credits for the solution go to Tim Hunt!
2023-01-13 18:12:48 +08:00
Eloy Lafuente (stronk7) 357f784091 MDL-76537 behat: Month and day names are lang-dependent correct utf-8
Just verify that calendars are always displayed with correct UTF-8
and in the language the user is currently using.
2023-01-13 09:57:28 +01:00
Eloy Lafuente (stronk7) 7827edc78d MDL-76537 core: Fix date_format_string() to work with php-intl
With Moodle 4.1 and up, we have stopped to work with strftime(),
because it's deprecated for PHP 8.1 and up and, instead we are
using core_date::strftime() that performs the conversions using
the php-intl extension.

The original strftime() had a lot of OS-specific dependencies,
both about locale names and charsets used to provide the information.

Instead, the php-intl gets rid of all those OS-specific nightmares
and only uses ICU/Unicode locales and UTF-8.

Because of that, the old utf-8 => windows charset => utf-8
conversions aren't needed anymore. Hence, removing them.
2023-01-13 09:57:28 +01:00
Angelia Dela Cruz 320218633a MDL-76639 behat: Add Behat test coverage for quiz with limited attempts 2023-01-13 16:10:00 +08:00
Jun Pataleta 5dbac075be weekly release 4.2dev 2023-01-13 10:52:09 +08:00
Amaia Anabitarte bb3a7fcda5 MDL-76377 block_myoverview: Improve zero state 2023-01-12 15:55:57 +01:00
Paul Holden e72f47cbfc Merge branch 'MDL-76739-master-fix' of https://github.com/junpataleta/moodle 2023-01-12 12:09:15 +00:00
Jun Pataleta 4c36405d3a Merge branch 'MDL-76649-master-fix' of https://github.com/junpataleta/moodle 2023-01-12 17:09:58 +08:00
Jun Pataleta 25ff4c441b MDL-76739 mod_data: Split comments test into two
MDL-75596 added an "Insert an activity or resource before ..." button
that allows adding an activity or a resource before or after another
activity in a course. This renders the button in the DOM (although
hidden and shown only on mouseover) when there's at least one activity
in the course.

In this issue, the button's label was renamed to "Add an activity or
resource before ..." and it now obscures the normal "Add an activity or
resource" button at the bottom of the course section from being
interacted on when running Behat tests.

This failure happens in the create_activity.feature file as it creates
two DB activities in a single scenario – one when "usecomments" is
turned on and one when it's turned off. Given this limitation, a
workaround is to split the "Teacher cannot enable comments if they are
disabled at site level" scenario into two scenarios with the first one
testing when "usecomments" is on while the second scenario testing when
"usecomments" is turned off.
2023-01-12 17:05:55 +08:00
Cameron Ball 6bf955ca9e MDL-76869 gradebook: Pass exception to rollback 2023-01-12 16:31:46 +08:00
Ilya Tregubov 93a70ba807 MDL-69690 mod_workshop: Fix fieldname for workshop. 2023-01-12 15:01:11 +07:00
Laurent David e4a1d891fc MDL-76358 mod_data: Refactor preset output
* Remove unused manager in the presets.php
* Use single quote instead of double quote for array keys
2023-01-12 08:24:45 +01:00
Jun Pataleta 71b3f9c39f MDL-76649 mod_quiz: Use correct quizid attribute from attempt 2023-01-12 15:17:35 +08:00
Andrew Nicols 769397fd9d Merge branch 'MDL-76820-master' of https://github.com/cameron1729/moodle 2023-01-12 12:09:11 +08:00
Jun Pataleta e0d857f39f Merge branch 'MDL-76649' of https://github.com/timhunt/moodle 2023-01-12 12:06:35 +08:00
Jun Pataleta f23d02a0ca Merge branch 'MDL-76474-master-2' of https://github.com/HuongNV13/moodle 2023-01-12 11:55:29 +08:00
Huong Nguyen 6dd6248e41 MDL-76474 tiny_h5p: Prevent H5P Formatter placeholder to be assessed 2023-01-12 10:51:03 +07:00
Huong Nguyen d21b6d194a MDL-76474 tiny_accessibilitychecker: Prevent placeholders to be assessed 2023-01-12 10:51:03 +07:00
Huong Nguyen c4c85a8f1c MDL-76474 editor_tiny: Implement placeholder selector list
We created a list of placeholder selectors in placeholderSelectors option.
The purpose of this list is to indicate the contents that are only shown
in the editor and not to the users, by that way, we can decide to apply or
not to apply rules, styles, etc... to these contents
2023-01-12 10:51:02 +07:00
Michael Hawkins 71564e3e70 MDL-76861 blog: Ensure correct escaping applied to search string 2023-01-12 11:42:51 +08:00
Jake Dallimore 230ac291c8 MDL-76862 user: Unit test for setting user home page preferences 2023-01-12 11:35:10 +08:00
Paul Holden 2dfc273752 MDL-76862 user: ensure user can only update own preferred start page. 2023-01-12 11:35:10 +08:00
Andrew Nicols f516200459 Merge branch 'MDL-76839' of https://github.com/paulholden/moodle 2023-01-12 10:56:33 +08:00
Cameron Ball c9769197cd MDL-76820 core_search: Reset manager::$coursedeleting between tests 2023-01-12 10:43:29 +08:00
Jun Pataleta 2a29bead81 Merge branch 'MDL-76739-master-test' of https://github.com/junpataleta/moodle 2023-01-12 10:17:08 +08:00
Jun Pataleta 5166c729b4 MDL-76739 behat: Replace occurrences of "surname" in Behat tests
Replace occurrences of "surname" in Behat tests with "last name"
2023-01-12 09:53:41 +08:00
David Mudrák 50ba9dc72c MDL-76739 lang: Use the fixed strings in the tests, too 2023-01-12 09:17:27 +08:00
Helen Foster 975a127325 MDL-76739 lang: Import fixed English strings (en_fix) 2023-01-12 09:17:27 +08:00
Ilya Tregubov be1c1485ad Merge branch 'MDL-76607-master' of https://github.com/davewoloszyn/moodle 2023-01-11 19:11:49 +07:00
Amaia Anabitarte bbd7aa78b2 MDL-76766 mod_quiz: Allow shuffling quizes with no questions 2023-01-11 11:15:35 +01:00
Laurent David 45317d6db5 MDL-76358 mod_data: Add options to preset menu
* Add "Preview" and "Use this preset" menus to the preset plugin page's
burger menu
* Refactor importmapping dialogue to use the 'data-action' selector
* Add a new set_kebab_trigger action menu method
* Use set_additional_classes method for action menu
* Remove redundant parameter to add_action_menu
2023-01-11 10:59:04 +01:00
Andrew Nicols c81fbbfec9 Merge branch '66924-view-own-private-reply-master' of https://github.com/DSI-Universite-Rennes2/moodle 2023-01-11 15:52:41 +08:00
Tim Hunt 3b23ff6fec MDL-76810 redirect handling: ensure return URLs are properly sanitised 2023-01-11 11:42:28 +08:00
Andrew Nicols 6f1c9d3b53 Merge branch 'MDL-76614' of https://github.com/timhunt/moodle 2023-01-11 10:32:42 +08:00
Andrew Nicols 9e21e8a807 Merge branch 'MDL-76356' of https://github.com/stronk7/moodle 2023-01-11 10:26:20 +08:00
Jake Dallimore 98a23389b6 Merge branch 'MDL-76597-master-2' of https://github.com/junpataleta/moodle 2023-01-11 10:12:20 +08:00
Paul Holden 362818ff36 Merge branch 'MDL-76811-master' of https://github.com/andrewnicols/moodle 2023-01-10 16:40:05 +00:00
Paul Holden 6bd76e2a4d Merge branch 'MDL-76803-master' of https://github.com/junpataleta/moodle 2023-01-10 16:24:09 +00:00
Paul Holden 37f68b7522 Merge branch 'MDL-76653-master' of https://github.com/lameze/moodle 2023-01-10 15:29:15 +00:00
Marina Glancy b1c97381b4 MDL-76356 various: avoid implicit conversion to int
PHP before version 8.1 automatically converted to int if the function
parameter (or array key) is expected to be int. PHP 8.1 shows notice in
this case
2023-01-10 15:27:11 +01:00
Paul Holden 1bf87e87a4 MDL-76839 mod_data: correct external test class coverage notation. 2023-01-10 12:59:06 +00:00
Paul Holden 4250414279 Merge branch 'MDL-76833-master' of https://github.com/andrewnicols/moodle 2023-01-10 12:29:17 +00:00
Marina Glancy 594a8c5ab7 MDL-76356 various: avoid implicit conversion to arrays
PHP before version 8.1 automatically converted stdClass or 'false' to arrays if
function parameter expects array (for example, "reset").
PHP 8.1 shows notices in these situations
2023-01-10 12:16:52 +01:00
Julien Boulen 5f493679c3 MDL-76313 forum: improve accessibility on subscribers page
- add header on table of subscribers
- remove one redundant header
2023-01-10 11:16:31 +01:00
Jun Pataleta 2924075480 MDL-76803 lang: Update usages of reworded email display options 2023-01-10 16:01:18 +08:00
Meirza c5e4685833 MDL-73519 core_course: re-styling the unordered list.
Currently, the unordered list in the course content follows the original style and
is ordered from the top of the content section, which is not part of the description.
That's why the first occurrence of the list is the 2nd level which uses the circle as the marker/list type
instead of the disc. In contrast, the editor always uses the original style.

so we need to reset the CSS of the unordered list in the description to the original
which the disc as the first marker, a circle for the second marker,
and a square for the following levels.
2023-01-10 11:54:47 +07:00
Andrew Nicols 7519620572 MDL-76833 core: Bump phpunit/php-code-coverage version
This includes a bug fix for a display issue with code coverage reporting
in phpunit's HTML output report.
2023-01-10 12:09:01 +08:00
Andrew Nicols 35eb66d9dc MDL-76811 mod_data: Remove duplicate tests 2023-01-10 11:39:40 +08:00
Andrew Nicols cec147f428 MDL-76811 mod_data: Stop testing template creation on field creation
The default template is no longer created when creating the fields with
the generator, so we should stop testing that it is.
2023-01-10 11:39:40 +08:00
Andrew Nicols 103b17c761 MDL-76811 mod_data: Generator test cleanup 2023-01-10 11:39:39 +08:00
Jun Pataleta 3385715f52 MDL-76803 lang: Make email display options more concise 2023-01-10 11:04:03 +08:00
Simey Lameze 4d2b1f26a7 MDL-76653 behat: add coverage for SCORM availability 2023-01-10 10:26:20 +08:00
Jun Pataleta 1a7a646ca2 Merge branch 'MDL-76061-master' of https://github.com/PhMemmel/moodle 2023-01-10 09:41:37 +08:00
james-cnz 2771e87019 MDL-76729 filepicker: Restore file picker thumbnails in tree view 2023-01-10 12:03:28 +13:00
Tim Hunt 7e4972a4a8 fixup! MDL-76614 quiz: deprecate class moodle_quiz_exception 2023-01-09 17:48:26 +00:00
Philipp Memmel b84005ef9f MDL-76061 core_calendar: Fix changing event type from 'user' 2023-01-09 14:49:50 +01:00
Julien Boulen b87ead3384 MDL-66924 mod_forum: Allow users to see their own private messages
Allow users to see their own private messages even if they don't have
mod/forum:readprivatereplies capability

Add behat test to avoid MDL-67109 issue.

Co-authored-by: Martin Putzlocher <mputzi@users.noreply.github.com>
2023-01-09 14:41:01 +01:00
Tim Hunt 192f993906 MDL-76649 quiz statistics task: output more useful trace info
At the moment, quiz_statistics\task\recalculate gives no useful
information about what it is doing, which makes it hard to investigate
if the task fails. This commit makes it more usefully verbose.

Also, following this change, one instance of this task will not
run for more than one hour at a time.

As part of this commit, I have added a new helper mtrace_exception.
to consistently log exceptions in scheduled tasks. It is sad to
add a new function to moodlelib.php, but that seemed the logical place.
Looking at other tasks, this method is badly needed. Many are just
logging the ->getMessage() which is normaly insufficient for proper
debugging. However, swiching all existing tasks to use the new function
will need to wait for a future MDL.
2023-01-09 13:26:41 +00:00
Paul Holden 025985ff61 Merge branch 'MDL-75532-master' of https://github.com/snake/moodle 2023-01-09 11:50:58 +00:00
Jun Pataleta 6bbe2ebf06 Merge branch 'MDL-76785' of https://github.com/paulholden/moodle 2023-01-09 19:38:36 +08:00
Jun Pataleta db2ee34986 Merge branch 'MDL-76506' of https://github.com/jrchamp/moodle 2023-01-09 19:34:07 +08:00
Paul Holden 535d6e2445 MDL-76785 tiny_media: define video width/height language strings.
AMOS BEGIN
 CPY [videoheight,atto_media],[videoheight,tiny_media]
 CPY [videowidth,atto_media],[videowidth,tiny_media]
AMOS END
2023-01-09 10:52:22 +00:00
Jun Pataleta 438f6d73e0 Merge branch 'MDL-76787' of https://github.com/paulholden/moodle 2023-01-09 18:39:32 +08:00
Paul Holden 8749d96121 Merge branch 'MDL-76601-master' of https://github.com/junpataleta/moodle 2023-01-09 10:11:11 +00:00
Jun Pataleta 2892b7a0b2 Merge branch 'MDL-76812' of https://github.com/paulholden/moodle 2023-01-09 17:46:29 +08:00
Jun Pataleta 7927374af9 MDL-76597 mod_quiz: Add a default heading name for Behat tests 2023-01-09 15:41:27 +08:00
Ilya Tregubov 9934ec1363 Merge branch 'MDL-76134-abstract' of https://github.com/Chocolate-lightning/moodle 2023-01-09 14:39:28 +07:00
Jake Dallimore 969a392cf1 MDL-75532 enrol_lti: fix optional lineitemsurl in grade sync task
As in MDL-74691, we need either or both of these fields, meaning either
one could be omitted. This just supports that as per the fix made in
MDL-74691.
2023-01-09 11:36:04 +08:00
Jake Dallimore 6331a834a4 MDL-75532 enrol_lti: add tests for coupled and decoupled line items
This covers the following cases:
1. Where only the 'lineitem' service endpoint is provided
2. Where only the 'lineitems' service endpoint is provided.
Existing tests already cover the case where both are provided.
2023-01-09 11:36:04 +08:00
hieuvu 2b6bf085af MDL-76582 question: Allow response filearea to have different pattern 2023-01-09 09:26:52 +07:00
Simey Lameze 59a459c5e7 MDL-76652 behat: use data generator and remove duplicated steps 2023-01-09 10:16:14 +08:00
Simey Lameze 00bd42ea5d MDL-76652 behat: add coverage for postwithoutthrottling logic 2023-01-09 10:16:14 +08:00
Mathew May bf783645e1 MDL-76134 gradebook: Modify user story behat tests into passable runs 2023-01-09 09:22:20 +08:00
Mathew May 712f219c7c MDL-76134 gradebook: Hook into tertiary dropdown item 2023-01-09 09:22:20 +08:00
Mathew May 6b0d3b3eae MDL-76134 gradebook: Add a bare dropdown component 2023-01-09 09:22:20 +08:00
Mathew May d83fcf1976 MDL-76134 core: Provide a option to render initials bars smaller 2023-01-09 09:22:20 +08:00
Mathew May 9af57b7180 MDL-76134 core: User story behat test 2023-01-09 09:21:19 +08:00
Meirza b79231361b MDL-61789 auth_oauth2: Update profile fields based on data mapping.
After the user creation, the system must call an update function to update profile_fields_*.
We also provided two functions into user/profile/lib.php to get available from other areas.
We added PHP unit testing for new public functions and
the Behat tests for custom profile fields with locked and unlocked statuses.

Co-authored-by: Matt Porritt <matt.porritt@moodle.com>
2023-01-07 20:59:26 +07:00
Jun Pataleta 08a2781607 MDL-76597 mod_quiz: Set presentation role for the question list
Since the <ul> and <li> elements for listing the quiz questions and
elements are mainly used for layout purposes, it is better to set the
role of these elements to presentation only.
The aria-label for the <li> element is inappropriate and can also cause
confusion to screen reader users. Better to remove this. Though this is
being used in the confirmation modal so better to just change it to a
data attribute.
2023-01-06 22:37:54 +08:00
Jun Pataleta 317dd19f02 MDL-76597 mod_quiz: Set presentation role for the question list
Since the <ul> and <li> elements for listing the quiz questions and
elements are mainly used for layout purposes, it is better to set the
role of these elements to presentation only.
2023-01-06 22:37:54 +08:00
Jun Pataleta f7bcd8304f MDL-76597 mod_quiz: Add label for question checkboxes 2023-01-06 22:37:54 +08:00
Jun Pataleta beac221ac4 MDL-76597 mod_quiz: Darken section heading on quiz questions page 2023-01-06 22:37:54 +08:00
Jun Pataleta 384e40a750 MDL-76597 mod_quiz: Add label for version selector 2023-01-06 22:37:54 +08:00
Jun Pataleta e4f1f254c9 MDL-76597 mod_quiz: Add a default sr-only section heading
Add a default sr-only section heading in order to prevent having an
empty heading for the quiz section which is not good for accessibility.

Plus:
- There's also an existing issue where filters are never applied to
section headings on load. This has been fixed in this commit as well.
- Button role added for the edit section button which enables it to
take advantage of the theme highlighting when it receives focus.
2023-01-06 22:37:54 +08:00
Tim Hunt a02497f942 MDL-76614 quiz: clean up view.php script 2023-01-06 14:35:55 +00:00
Tim Hunt ca7fb1eb02 MDL-76614 quizaccess_seb: rename access_manager & quiz_settings classes
This is to avoid confusion between the main mod_quiz classes and SEB's own.
2023-01-06 14:35:55 +00:00
Tim Hunt 58e4bc9a3e MDL-76614 quiz: clean up the quiz_settings class 2023-01-06 14:35:54 +00:00
Tim Hunt a9f8547599 MDL-76614 quiz: rename quiz => mod_quiz\quiz_settings 2023-01-06 14:35:54 +00:00
Tim Hunt ae6a1c0391 MDL-76614 quiz: clean up the quiz_attempt class 2023-01-06 14:35:52 +00:00
Tim Hunt 5682c8c70e MDL-76614 quiz: move class quiz_attempt => mod_quiz\quiz_attempt
I thought about renaming the class to just plain attempt, but I
acutally think quiz_attempt makes it clearer what this is. Also
not changing the name massively reduces the pain for everyone
updating their code (including me right now!)
2023-01-06 14:35:51 +00:00
Tim Hunt 79a29d243c MDL-76614 quiz: remove unneeded MOODLE_INTERNAL 2023-01-06 14:35:51 +00:00
Tim Hunt 03116995d5 MDL-76614 quiz: move quiz_review_nav_panel to classes 2023-01-06 14:35:51 +00:00
Tim Hunt ccbb5da784 MDL-76614 quiz: move quiz_attempt_nav_panel to classes 2023-01-06 14:35:51 +00:00
Tim Hunt adbd0daddb MDL-76614 quiz: clean up navigation_panel_base class 2023-01-06 14:35:50 +00:00
Tim Hunt 74c6823bac MDL-76614 quiz: move quiz_nav_panel_base to classes folder 2023-01-06 14:35:50 +00:00
Tim Hunt 600b17db21 MDL-76614 quiz: move quiz_nav_section_heading to classes folder 2023-01-06 14:35:50 +00:00
Tim Hunt 6833a902df MDL-76614 quiz: move quiz_nav_question_button to classes folder 2023-01-06 14:35:50 +00:00
Tim Hunt 89f97a7e2a MDL-76614 quiz: code cleanup in mod_quiz\output\renderer 2023-01-06 14:35:50 +00:00
Tim Hunt 5ef8b6978e MDL-76614 quiz: mod_quiz_renderer => mod_quiz\output\renderer 2023-01-06 14:35:49 +00:00
Tim Hunt 6c989eb24c MDL-76614 quiz: Final deprecation of view_page::$startattemptwarning
This waas deprecated in Moodle 3.1 MDL-46091
2023-01-06 14:35:49 +00:00
Tim Hunt abeeaef10a MDL-76614 quiz: mod_quiz_view_object => mod_quiz\output\view_page 2023-01-06 14:35:49 +00:00
Tim Hunt aceae3a4fa MDL-76614 quiz: move mod_quiz_links_to_other_attempts => classes\output 2023-01-06 14:35:49 +00:00
Tim Hunt 581a3bc7e9 MDL-76614 quiz: quiz_add_random_form => mod_quiz\form\add_random_form 2023-01-06 14:35:49 +00:00
Tim Hunt dd41b972c0 MDL-76614 quiz: clean up edit_override_form class 2023-01-06 14:35:49 +00:00
Tim Hunt 8af8ef3b9f MDL-76614 quiz: clean up access_rule_base class 2023-01-06 14:35:48 +00:00
Tim Hunt 2ff112c688 MDL-76614 quiz: quiz_access_rule_base => mod_quiz\local\access_rule_base 2023-01-06 14:35:48 +00:00
Tim Hunt dda9ba07f3 MDL-76614 quiz: quiz_override_form => mod_quiz\form\edit_override_form 2023-01-06 14:35:48 +00:00
Tim Hunt f83181d397 MDL-76614 quiz: deprecate class moodle_quiz_exception
Code should just directly use moodle_execption.

Note, some of the existing uses (in web services) were passing a
literal message, not a language string identifier, but I decided
now was not the time to try to fix that.
2023-01-06 14:35:48 +00:00
Tim Hunt f6ae83f40e MDL-76614 quiz: clean up update_overdue_attempts class 2023-01-06 14:35:48 +00:00
Tim Hunt 4ae4d8d1b6 MDL-76614 quiz: merge mod_quiz_overdue_attempt_updater into task
The only place this code was used was in
mod_quiz\task\update_overdue_attempts so neater to combine them into one
class.
2023-01-06 14:35:48 +00:00
Tim Hunt 91c913debc MDL-76614 quiz: move mod_quiz_preflight_check_form to classes & clean up 2023-01-06 14:35:47 +00:00
Tim Hunt b3d59e5ad8 MDL-76614 quiz: clean up class access_manager 2023-01-06 14:35:47 +00:00
Tim Hunt fed4a7fbd4 MDL-76614 quiz: move quiz_access_manager -> mod_quiz\access_manager 2023-01-06 14:35:47 +00:00
Paul Holden 15286a56d5 MDL-64153 dml: fix trailing comma and whitespace in upgrade note. 2023-01-06 11:35:04 +00:00
Paul Holden e395dff081 Merge branch 'MDL-32114-master' of https://github.com/srobotta/moodle 2023-01-06 11:20:46 +00:00
Paul Holden bb0369fd65 Merge branch 'MDL-64153-master' of https://github.com/meirzamoodle/moodle 2023-01-06 10:57:10 +00:00
Paul Holden bb95badd99 Merge branch 'MDL-76578-master' of https://github.com/aanabit/moodle 2023-01-06 10:41:35 +00:00
Paul Holden 982dbee359 Merge branch 'MDL-76781-master' of https://github.com/lucaboesch/moodle 2023-01-06 10:23:54 +00:00
Paul Holden 6183ad3c22 MDL-76812 reportbuilder: ensure audience key is incremented correctly. 2023-01-06 09:57:14 +00:00
Ilya Tregubov db1b807270 MDL-76251 mod_forum: Fix illegal whitespace. Another try. 2023-01-06 16:41:59 +07:00
Paul Holden 0e742a2fc9 MDL-69643 message: final removal of deprecated 310 methods. 2023-01-06 09:28:40 +00:00
Ilya Tregubov 8bcf50cfe3 Merge branch 'MDL-76251-patch' of https://github.com/ilyatregubov/moodle 2023-01-06 16:14:23 +07:00
Ilya Tregubov f6a3144275 MDL-76251 mod_forum: Fix illegal whitespace. 2023-01-06 16:08:17 +07:00
Ilya Tregubov 7349b04257 Merge branch 'MDL-76251-master' of https://github.com/aya-saad1/moodle 2023-01-06 15:37:20 +07:00
Matt Porritt 6793891887 MDL-61789 auth_oauth2: Allow admin to choose profile fields for mapping
Update oauth2 to allow mapping of provider attributes against
user profile fields. Fields can also be locked to prevent
user changes.

Co-Authored-By: Michael Milette <michael.milette@tngconsulting.ca>
2023-01-06 13:27:11 +07:00
Ilya Tregubov f99f305be6 Merge branch 'MDL-75878-master' of https://github.com/sammarshallou/moodle 2023-01-06 11:07:51 +07:00
Meirza f8537ffec6 MDL-64153 dml: Added extrainfo in the DB options config.
extrainfo is an extra information for the DB driver, e.g. SQL Server,
has additional configuration according to its environment,
which the administrator can specify to alter and override any connection options.

Co-authored-by: LukeCarrier <luke@carrier.im>
2023-01-06 06:17:17 +07:00
Stephan Robotta 4a31dd69d6 MDL-32114 form: markdown must be preserved on saving post
- Markdown is saved to the DB, no conversion to HTML to keep
  ability to reedit the content without beaking it.
- Blockquote element is styled that it's distingishable from
  normal text.
2023-01-05 18:34:44 +01:00
Paul Holden d843168c14 MDL-69127 analytics: final removal of renamed target class mapping. 2023-01-05 17:28:59 +00:00
Paul Holden 2c57184251 MDL-69126 lang: final removal of deprecated 310 strings. 2023-01-05 14:38:37 +00:00
Andrew Nicols 23d8120ab0 Merge branch 'MDL-76508-master' of https://github.com/meirzamoodle/moodle 2023-01-05 21:30:01 +08:00
Luca Bösch 864a1eba5a MDL-76781 gradebook: support multilingual group names. 2023-01-05 13:27:39 +01:00
Paul Holden b8b905cd90 weekly release 4.2dev 2023-01-05 10:53:08 +00:00
Aya Saad 7c074d8b8e MDL-76251 mod_forum: fix responsive issues in discussion 2023-01-05 11:47:15 +02:00
Meirza 3b4bc74692 MDL-76219 lib: Remove Box\Spout library 2023-01-05 16:04:37 +07:00
Meirza 93220a66f5 MDL-76219 lib: Change Box\Spout to OpenSpout library 2023-01-05 15:58:18 +07:00
David Woloszyn 6dc10b6241 MDL-76607 timeline: Reordered message to account for long course name 2023-01-05 12:11:42 +11:00
David Woloszyn 004b220513 MDL-76607 css: Fixed various classes where long strings break layout 2023-01-05 12:10:58 +11:00
Paul Holden a082b6e084 MDL-76787 tiny_h5p: correct capability for plugin enabled state. 2023-01-04 16:07:50 +00:00
Sara Arjona 908f3a4c78 Merge branch 'MDL-74987-master' of https://github.com/ferranrecio/moodle 2023-01-04 16:57:31 +01:00
Sara Arjona 0a27fcbcde Merge branch 'MDL-76375-master' of https://github.com/lucaboesch/moodle 2023-01-04 16:21:30 +01:00
Sara Arjona be95fb2581 Merge branch 'MDL-75596-master' of https://github.com/sh-csg/moodle 2023-01-04 16:15:37 +01:00
Luca Bösch 57682b43ae MDL-76375 quiz generator: Allow more than one attempt by Behat tests. 2023-01-04 15:12:58 +01:00
Paul Holden bb0085e1d9 MDL-76725 mod_wiki: avoid named arguments in real path callback.
See also f4fb91ae. PHP8 now supports named arguments in calls to
the `call_user_func_array` method, which can result in differing
behaviour compared to PHP7, e.g. in this case it was throwing an
exception due to an unknown named parameter.
2023-01-04 14:08:20 +00:00
Sara Arjona b92b0b6cea Merge branch 'MDL-76221' of https://github.com/paulholden/moodle 2023-01-04 13:08:44 +01:00
Paul Holden 7a36c24c92 MDL-76657 grade: load required test libraries for grade helper. 2023-01-04 11:20:44 +00:00
Paul Holden 38a25b4f3e Merge branch 'MDL-76657-master' of https://github.com/rezaies/moodle 2023-01-04 11:10:35 +00:00
Paul Holden 45818da292 MDL-76221 reportbuilder: improve report test generator methods.
Test generators for creating report columns, filters and conditions
now allow for setting all persistent properties.
2023-01-04 10:56:27 +00:00
Jun Pataleta 401fc00245 Merge branch 'MDL-74822-master' of https://github.com/HuongNV13/moodle 2023-01-04 17:29:26 +08:00
Jun Pataleta 9581a44cf8 MDL-76601 block_myoverview: Remove hover action before clicking on menu
With the course card menu now always displayed, there's no need to hover
first before clicking on the menus on block_myoverview Behat tests.
2023-01-04 17:21:47 +08:00
Jun Pataleta 466266999c MDL-76601 blocks: Always display course card menus
Displaying the course card menu only on hover is bad in terms of
accessibility as it prevents keyboard-only users from accessing the
menu. So it's better to always display them.
2023-01-04 17:00:04 +08:00
Ferran Recio 302a5e43a6 MDL-74987 core_courseformat: alt to duplicate modules
If a user drags an activity and press the ALT key, the activity will be
duplicated in the new place instead of simply moved. This behaviour
is quite normal in many softwares and it is a non intrusive usability
improvement.
2023-01-04 09:25:52 +01:00
Ferran Recio 35a12cfffb MDL-74987 core_courseformat: migrate duplicate to state action 2023-01-04 09:25:52 +01:00
Ferran Recio a3264eb5e0 MDL-74987 core_courseformat: add pending to refresh activity
The activity reload was missing a pending control. This can lead to
behat errors if the module refresh takes longer than expected for some
reason.
2023-01-04 09:25:52 +01:00
Sara Arjona 7202dcb79e Merge branch 'MDL-76181' of https://github.com/paulholden/moodle 2023-01-04 09:20:13 +01:00
Meirza b2b17b9d9b MDL-76219 lib: Add the OpenSpout 3.7.3 library 2023-01-04 09:47:06 +07:00
Stefan Hanauska 15034e7100 MDL-75596 course: Allow inserting activities everywhere
Co-authored-by: Mathew May <mathewm@hotmail.co.nz>
2023-01-03 21:49:06 +01:00
Sara Arjona 139a629763 Merge branch 'MDL-75177' of https://github.com/paulholden/moodle 2023-01-03 17:50:34 +01:00
sam marshall fbd61d1268 MDL-75878 Course: Adding graded activity too slow when lots of grades
Adding an activity with a grade item previously triggered a course
regrade, which can be extremely slow. This change makes it so that on
courses where regrading is slow, when you add an activity that
requires regrading, it takes you to an intermediate screen with a
progress bar.

This change also fixes a bug in the existing grade overview report,
which shows grades across multiple courses, but previously only
checked, and if necessary regraded, one course.
2023-01-03 16:04:58 +00:00
Sara Arjona 4759dbe119 Merge branch 'MDL-76308-master' of https://github.com/BruceGoodGuy/moodle 2023-01-03 14:12:53 +01:00
Paul Holden cade48a337 Merge branch 'MDL-74989-master' of https://github.com/ferranrecio/moodle 2023-01-03 12:33:45 +00:00
Paul Holden cd2fc29712 Merge branch 'MDL-53137-master' of https://github.com/lucisgit/moodle 2023-01-03 12:14:30 +00:00
Sara Arjona ae71d43924 Merge branch 'MDL-71506-master' of https://github.com/lucaboesch/moodle 2023-01-03 13:10:11 +01:00
Ferran Recio fe4784e60f MDL-74989 core_courseformat: migrate cm delete to reactive
Migrate the course index delete activities to the new reactive actions
with batch deletion.
2023-01-03 13:07:31 +01:00
Paul Holden 7cc42b6d97 Merge branch 'MDL-76780-master' of https://github.com/sarjona/moodle 2023-01-03 11:48:43 +00:00
Paul Holden b938034022 Merge branch 'MDL-75346-reset_dashboard_error' of https://github.com/leonstr/moodle 2023-01-03 11:28:19 +00:00
Sara Arjona 788a8d9598 MDL-76780 core: Add missing customfield to apis.json 2023-01-03 11:52:47 +01:00
Ferran Recio d789209f3e MDL-74989 core_courseformat: fix courseindex components init methods
The courseindex init methods contains static references to the class
name instead of a dynamic "this" reference. This makes harder for format
plugins to extend those classes as they need to override the init method
for no specific reason.
2023-01-03 11:10:33 +01:00
Paul Holden 42926069da Merge branch 'MDL-76188-master' of https://github.com/ferranrecio/moodle 2023-01-03 09:34:28 +00:00
Paul Holden 2f6ee403ef Merge branch 'MDL-75877-master' of https://github.com/JBThong/moodle 2023-01-03 09:27:51 +00:00
Paul Holden 63a43391ad Merge branch 'MDL-58615-master' of https://github.com/andrewnicols/moodle 2023-01-03 09:20:22 +00:00
Shamim Rezaie cf2b926f10 MDL-76657 gradebook: Remove hard-coded plugin names from unit test 2023-01-03 20:13:12 +11:00
Andrew Nicols 03b79c4921 MDL-32105 mod_glossary: Improve behat test 2023-01-03 15:31:48 +08:00
Andrew Nicols 623c8c1906 Merge branch 'MDL-32105-master' of https://github.com/Chocolate-lightning/moodle 2023-01-03 15:18:01 +08:00
Peter 8ab91e47b9 MDL-32105 mod_glossary: Restrict glossary aliases by set of keywords 2023-01-03 13:45:18 +08:00
Andrew Nicols 1ac2eb53fb MDL-58615 core: Remove the useexternalyui setting
I have opted not to go through any deprecation process for this as there
is not really much we can do about it anyway. There is no loss of
functionality - just a change of where things are served from.

The Yahoo! CDN was only used for http connections as it did not
officially support SSL, and it is not guaranteed to continue existing in
the future since YUI has been deprecated for a number of years now.
2023-01-03 11:43:01 +08:00
Huong Nguyen ef8420e5a3 MDL-74822 usertours: Fix accessibility issues with user tours
Including in this commit:
 - Prevent the tour to be displayed if the CSS is disabled by the browser
 - Removed redundant tabindex=0 attribute on the target
 - Created extra code to re-calculate the suitable position of the tour
 - Fixed tour issue in 200% and 400% zoom
 - Fixed tour highlight is not correct in 200% and 400%
2023-01-03 10:34:48 +07:00
Thong Bui c0903eade7 MDL-75877 workshop: Refactor outputs in view.php 2023-01-03 10:20:52 +07:00
Sara Arjona decf1ba332 Merge branch 'MDL-60038-master' of https://github.com/aneno-m-e/moodle 2023-01-02 16:35:16 +01:00
Luca Bösch 3f489e2d2a MDL-71506 mod_choice: suppress non respondents in downloads if set so. 2023-01-02 15:54:25 +01:00
Sara Arjona ac023fbfb2 Merge branch 'MDL-76106-master' of https://github.com/NashTechOpenUniversity/moodle 2023-01-02 13:07:34 +01:00
Sara Arjona 6821897849 Merge branch 'MDL-76760' of https://github.com/paulholden/moodle 2023-01-02 12:27:34 +01:00
Ferran Recio 63a7c58ee3 MDL-76188 core_courseformat: migrate highlight to reactive component
The highlight and unhighlight sections applies only to the format_topics
plugins. With this commit all the related code is migrated to reactive
component and format_topics extend the current course editor to add all
the logic
2023-01-02 11:39:52 +01:00
Sara Arjona 912aaf5649 Merge branch 'MDL-76301' of https://github.com/dravek/moodle 2023-01-02 10:59:15 +01:00
Paul Holden 121f5b6300 MDL-76221 core: method to filter by defined properties of persistent. 2022-12-29 14:02:58 +00:00
Paul Holden 5162a7882d MDL-76181 reportbuilder: sort columns during stress testing. 2022-12-29 13:59:31 +00:00
Sara Arjona 12e9d9e1bf weekly release 4.2dev 2022-12-29 12:57:40 +01:00
Sara Arjona 2528ff0664 Merge branch 'MDL-76399-patch-master' of https://github.com/ilyatregubov/moodle 2022-12-29 09:12:05 +01:00
Ilya Tregubov e3d5313d55 MDL-76399 behat: switch to appropriate Behat step for selects. 2022-12-29 14:57:31 +07:00
Ilya Tregubov 74aeed54a4 Merge branch 'm42_MDL-69581_Improve_MySQL_MariaDB_Server_Version_Detection_v3' of https://github.com/scara/moodle 2022-12-29 10:30:44 +07:00
Ilya Tregubov e93d2b0cbe Merge branch 'MDL-76399' of https://github.com/paulholden/moodle 2022-12-29 09:40:51 +07:00
Sara Arjona bb883d95aa Merge branch 'MDL-76153' of https://github.com/paulholden/moodle 2022-12-28 18:50:28 +01:00
Sara Arjona 2842575f95 Merge branch 'MDL-76479' of https://github.com/paulholden/moodle 2022-12-28 18:37:39 +01:00
Sara Arjona ec6e4419ed Merge branch 'MDL-76154' of https://github.com/paulholden/moodle 2022-12-28 18:32:01 +01:00
Sara Arjona 7f10321d79 Merge branch 'MDL-76004-master' of https://github.com/aanabit/moodle 2022-12-28 18:22:29 +01:00
Sara Arjona 8b61e8c7ce Merge branch 'MDL-72523' of https://github.com/paulholden/moodle 2022-12-28 13:01:33 +01:00
Sara Arjona 3dd93ffc5e Merge branch 'MDL-76617' of https://github.com/stronk7/moodle 2022-12-28 12:42:12 +01:00
Paul Holden a6e45197ca MDL-72523 calendar: return original focus from event modals. 2022-12-28 11:14:38 +00:00
Huong Nguyen 887f193c38 MDL-72523 javascript: Introduce setReturnElement for core/modal 2022-12-28 11:14:38 +00:00
Sara Arjona 53754b776c Merge branch 'MDL-72563-master' of https://github.com/KepaUrzelai/moodle 2022-12-28 12:13:09 +01:00
Sara Arjona 94b9eb947b Merge branch 'MDL-69071' of https://github.com/paulholden/moodle 2022-12-28 11:41:04 +01:00
Paul Holden 3982341f7a MDL-76760 tool_behat: defer library loading until service execution.
Ensures that API documentation can be generated without requiring
the presence of the `vendor/` directory.
2022-12-28 10:08:10 +00:00
Matteo Scaramuccia 0131c3be00 MDL-69581 dml: Improve MySQL/MariaDB server version detection
Add 'versionfromdb' to opt-in for VERSION() query.

mariadb_native_moodle_database::get_server_info() has been removed
to avoid the specific override: everything is now managed in the base
method which takes care of both MySQL and MariaDB versioning details.

New protected methods have been added too to improve the testing strategy,
allowing to mock the results from an actual DB connection.
The new testing strategy enables simulating even the Azure scenarios.
2022-12-28 10:59:45 +01:00
Sara Arjona 69ffc40621 Merge branch 'MDL-76304-master-add_pagesize_to_webservice' of https://github.com/alexmorrisnz/moodle 2022-12-28 10:23:42 +01:00
Sara Arjona 0adda8c66b Merge branch 'MDL-76734-master' of https://github.com/andrewnicols/moodle 2022-12-28 10:04:25 +01:00
Sara Arjona 0d31e86687 Merge branch 'MDL-74145' of https://github.com/paulholden/moodle 2022-12-28 09:56:13 +01:00
Ilya Tregubov dee383a0fa Merge branch 'MDL-76731_master' of https://github.com/PhilippImhof/moodle 2022-12-28 15:13:21 +07:00
Ilya Tregubov 1e4612ddb5 Merge branch 'MDL-76129-master' of https://github.com/sammarshallou/moodle 2022-12-28 11:26:26 +07:00
Sara Arjona 407f0604ba Merge branch 'MDL-76679' of https://github.com/paulholden/moodle 2022-12-27 16:55:17 +01:00
Sara Arjona 0b733266b0 Merge branch 'MDL-72775-master' of https://github.com/QihuiChan/moodle 2022-12-27 16:12:50 +01:00
Amaia Anabitarte f8ec9e6893 MDL-76578 core_course: One section per page summary information 2022-12-26 16:04:09 +01:00
Meirza fbc2732d9f MDL-76508 templates: Handling non-JSON string
When the param string contains a left curly bracket as the first character,
the system will assume the string is a JSON string and will be parsed and returned as an object.
But in some cases, the string is not JSON and will return an error if the system parses it.
For example, a user might have used the course name with a left curly bracket as the first character.
Adding a double quote after the left curly bracket to differentiate between string and JSON string,
so it can be safe to parse the string, and also added try..catch to ensure that the parsing creates an object type.
2022-12-23 09:57:36 +07:00
Qihui Chan 791e56d3bc MDL-72775 tool_task: check long running tasks 2022-12-23 09:41:05 +10:00
Noemie Ariste 60d3823bec MDL-60038 moodlelib: ignore site policy if user auth type = 'webservice' 2022-12-23 10:11:11 +13:00
Eloy Lafuente (stronk7) 47435471ee MDL-76617 store_mongodb: Adjust moodle to mongo-php-library to v1.15.0
The new library version should work without problems with older
php-mongodb extension versions:
- v1.15.0 (paired version, tested).
- v1.14.1 (tested)

But, in order to keep them paired, the requirements have been
raised to the extension v1.15.0. See:

https://www.mongodb.com/docs/drivers/php/#compatibility
2022-12-22 19:36:36 +01:00
Eloy Lafuente (stronk7) c5efd54971 MDL-76617 store_mongodb: Update mongo-php-library to v1.15.0
This updates the library from v1.13.1. Fixes some php81 warnings
leading to failed/risky tests.

The new library version should work without problems with older
php-mongodb extension versions:
- v1.15.0 (paired version, tested).
- v1.14.1 (tested)
2022-12-22 19:36:36 +01:00
Philipp Imhof 75be72b2d6 MDL-76731 behat: add steps to check for version
Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2022-12-22 17:13:02 +01:00
Tony Butler 2970988674 MDL-53137 qtype_numerical: Swap geo tolerance limits for -ve answers 2022-12-22 15:31:12 +00:00
Ilya Tregubov 15a695d573 weekly release 4.2dev 2022-12-22 19:16:24 +07:00
Ilya Tregubov 564e89d62e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2022-12-22 19:16:22 +07:00
sam marshall 0b2c2a1f95 MDL-76129 upgrade: Allow caching in specific functions
During install/upgrade, caching is disabled. This change provides a
way to temporarily enable caching (using in-memory cache storage only)
within a specific function; caches are deleted afterwards.

Adding this to two locations improves install performance quite a lot.

Caching is not enabled during the parts of plugin installation that
can vary for individual plugins (install.php/upgrade.php) as these
might be relying on its absence, for example by making direct database
changes.
2022-12-22 11:05:45 +00:00
sam marshall 7724e543ff MDL-76129 accesslib: Speed up adding new cloned capabilities
Adding new capabilities can be slow if they have permissions cloned
from an existing capability, and if there are many places in the
database where the existing capability was overridden.

This change optimises the clone-capability performance, approximately
halving the number of queries required.
2022-12-22 11:05:39 +00:00
sam marshall fe6a51265a MDL-76129 accesslib: Improve performance of adding new capabilities
Adding multiple capabilities was very slow because it clears and
rebuilds the capability cache after each one. This change makes it
clear the cache once after adding all capabilities, before adding
permissions to the archetype roles.
2022-12-22 11:05:14 +00:00
Ilya Tregubov 28f7a7c7b2 Merge branch 'MDL-76667' of https://github.com/paulholden/moodle 2022-12-22 12:24:57 +07:00
Ilya Tregubov e133891051 Merge branch 'MDL-74609-patch' of https://github.com/ilyatregubov/moodle 2022-12-22 12:24:57 +07:00
Paul Holden a48f53ec1c Merge branch 'MDL-75965-master' of https://github.com/HuongNV13/moodle 2022-12-22 12:24:57 +07:00
Tim Hunt 7622b4a1f7 MDL-74609 Quiz: question number customisation - fixup Behat 2022-12-22 12:24:57 +07:00
Andrew Nicols a13484242b MDL-75105 tool_behat: Coding style fixes 2022-12-22 12:24:57 +07:00
Andrew Nicols 98cc2716f0 Merge branch 'MDL-75105_master' of https://github.com/marxjohnson/moodle 2022-12-22 12:24:57 +07:00
Andrew Nicols 411d3730d9 Merge branch 'MDL-74609' of https://github.com/mkassaei/moodle 2022-12-22 12:24:57 +07:00
Paul Holden 7a7b970640 Merge branch 'MDL-75667-master' of https://github.com/farhan6318/moodle 2022-12-22 12:24:57 +07:00
Paul Holden 88339b4e67 Merge branch 'MDL-75914-master' of https://github.com/meirzamoodle/moodle 2022-12-22 12:24:57 +07:00
Thong Bui 4dc5d9e97f MDL-75978 Quiz\D&D: on mobile, a moving line-wrap can bork the question 2022-12-22 10:08:29 +07:00
AMOS bot 377e66bf0f Automatically generated installer lang files 2022-12-22 00:07:46 +00:00
Mahmoud Kassaei 2074448b34 MDL-74609 Quiz: allow the displayed question numbers to be customised 2022-12-21 12:04:30 +00:00
Meirza e33194755f MDL-75914 webservice: Added fake URL to avoid debugging output.
Webservice doesn't need to set the page URL. Hence,
any function that requires a page URL will raise debugging output.
The patch fixes it by adding a fake URL for the webservice.
The patch also removed assertDebuggingCalled because it is no longer needed.
2022-12-21 16:30:21 +07:00
Mark Johnson b05efb43a4 MDL-75105 tool_behat: List available data generators
This will find all data generators that can be used in behat via the
'the following "something" exist:' step, and display them in a select
list on the step definitions page.

When a generator is selected, it will fetch the required fields for that
generator and display them on the page.
2022-12-21 08:38:09 +00:00
Huong Nguyen fc7ecd4c73 MDL-75965 question_multichoice: Misalignment of feedback icons 2022-12-21 13:39:24 +07:00
Andrew Nicols c7dd76dadb MDL-76734 editor_tiny: Listen to TinyMCE submit events
jQuery submit events do not trigger the native submit event, and
therefore the TinyMCE submit listener is not called. This means that the
tinymce.triggerSave() function is not called, and the editor content is
not saved.

To work around this, if there is a form for the Node that the editor is
attached to, the jQuery submit event is listened to and the save event
called.

Unfortunately it is not possible to use a global jQuery submit listener
added to the document to save all editors on the page.
In some cases, this is too late because the bubbling process means that
a child node consumer may attempt to consume the data before the
delegated handler is called for the document.
2022-12-21 13:02:21 +08:00
Ilya Tregubov 72b9e745c3 Merge branch 'MDL-76727-master' of https://github.com/andrewnicols/moodle 2022-12-21 09:49:43 +07:00
Farhan Karmali bb82d29dd9 MDL-75667 admin: Fix cross db query issue for blocks 2022-12-20 17:29:13 +05:30
Paul Holden a70ad5036a Merge branch 'MDL-75279' of https://github.com/spvickers/moodle 2022-12-20 10:27:32 +00:00
Paul Holden 12d8884406 Merge branch 'MDL-76138-master' of https://github.com/Chocolate-lightning/moodle 2022-12-20 09:42:32 +00:00
Paul Holden 27ebde570f MDL-76153 blog: add comments to blogs custom report source. 2022-12-20 09:32:11 +00:00
Paul Holden 224b3ab51f MDL-76154 blog: add files/attachments to custom report source. 2022-12-20 09:31:29 +00:00
Mihail Geshoski ba93fe345a MDL-76138 gradereport_grader: Create basic action bar 2022-12-20 10:51:47 +08:00
Andrew Nicols 171149b2a2 MDL-76727 core: Allow phpcs configuration to be overridden locally
This change reduces the priority of the shipped phpcs configuration to
allow for local overrides.

This is beneficial in several situations:
- when users wish to apply stricter or additional standards
- when the integration team wishes to trial new rules
2022-12-20 09:34:47 +08:00
Stephen Vickers 073ba9ec63 MDL-75279 mod_lti: Add username to NRPS response 2022-12-19 17:13:42 +00:00
Paul Holden 5be3686da6 Merge branch 'MDL-72906' of https://github.com/tdjones/moodle 2022-12-19 10:23:03 +00:00
Alex Morris ab03eb210d MDL-76304 reportbuilder: Add pagesize parameter to get webservice 2022-12-19 16:59:27 +13:00
Ilya Tregubov e0a8a3bf52 Merge branch 'MDL-74779-master' of https://github.com/ssj365/moodle 2022-12-19 09:43:38 +07:00
Leon Stringer 199ce65ec0 MDL-75346 core_my: Handle missing blocks on reset
If the default dashboard contained a block that was missing from disk
then "Exception - Call to a member function instance_copy() on bool"
was shown to users.  This change only shows an error with debugging
enabled which now includes the name of the missing block.
2022-12-17 17:37:45 +00:00
AMOS bot 8a128e81c2 Automatically generated installer lang files 2022-12-16 21:03:08 +00:00
Paul Holden 2f29c6fa5e Merge branch 'MDL-75667-master' of https://github.com/farhan6318/moodle 2022-12-16 13:44:56 +00:00
Farhan Karmali b4e5e47a0f MDL-75667 admin: Avoid DB calls within loops on admin/blocks.php 2022-12-16 18:53:58 +05:30
Paul Holden 5185558105 MDL-76399 question: switch to appropriate Behat step for selects. 2022-12-16 13:08:56 +00:00
David Matamoros facc3322e4 MDL-76301 course: Add course overview files to courses datasource 2022-12-16 13:56:15 +01:00
Paul Holden 7d78fb0928 MDL-76399 behat: improvements to "should exist in" thrown exception. 2022-12-16 12:30:03 +00:00
Paul Holden 2d5b6d0e01 MDL-74145 reportbuilder: system report API for adding row checkboxes. 2022-12-16 12:09:28 +00:00
Paul Holden d73a92ca4a Merge branch 'MDL-76026' of https://github.com/AnupamaSarjoshi/moodle 2022-12-16 09:53:40 +00:00
Andrew Nicols 5019abfdd6 weekly release 4.2dev 2022-12-16 09:05:48 +08:00
Paul Holden 9fa7119da1 MDL-69071 core: retrieve full result from remote content.
Use the full result from download_file_content within the component
installer to ensure that spurious debugging is not emitted during
operation. Handle validation of the returned data consistently.
2022-12-15 17:19:22 +00:00
Andrew Nicols 793b0f0ed9 MDL-74923 quiz: Remove erroneous merge conflict line 2022-12-15 14:45:41 +08:00
Andrew Nicols ee48f4ab99 Merge branch 'MDL-74923' of https://github.com/timhunt/moodle 2022-12-15 07:35:46 +08:00
Tim Hunt 66c3c378a0 MDL-74923 quiz: tidy the report base classes 2022-12-14 22:38:11 +00:00
Tim Hunt 8cbc6acb17 MDL-74923 quiz: move report base classes to local folder 2022-12-14 22:38:11 +00:00
Paul Holden 698afd1708 MDL-76679 admin: correct password config field template.
The template changes were missed as part of 0795b579, update them
to match so that they continue to work with the unmask JS module.
2022-12-14 19:07:10 +00:00
Sara Arjona 78827384e4 Merge branch 'MDL-76674' of https://github.com/stronk7/moodle 2022-12-14 18:34:44 +01:00
Sara Arjona e0f6940bb2 Merge branch 'MDL-75805' of https://github.com/paulholden/moodle 2022-12-14 18:12:50 +01:00
Sara Arjona d98be6a34e Merge branch 'MDL-71096' of https://github.com/stronk7/moodle 2022-12-14 17:51:44 +01:00
Sara Arjona 63cbadb161 Merge branch 'MDL-75943' of https://github.com/roland04/moodle 2022-12-14 17:29:13 +01:00
Amaia Anabitarte 2d1883c92e MDL-76004 core_h5p: Ensure the browser is serving updated file 2022-12-14 16:02:44 +01:00
Eloy Lafuente (stronk7) 608d1ccc28 MDL-76674 core_lang: Add string for new America/Ciudad_Juarez 2022-12-14 15:49:23 +01:00
Paul Holden 5158be1b64 Merge branch 'MDL-76666' of https://github.com/stronk7/moodle 2022-12-14 13:22:01 +00:00
Mikel Martín 97be42d99b MDL-75943 reportbuilder: Refactor scss to support force card/table view 2022-12-14 13:52:44 +01:00
Mikel Martín 91cc98ed3d MDL-75943 reportbuilder: Add custom attributes to reports 2022-12-14 13:50:40 +01:00
Eloy Lafuente (stronk7) 9a6701c572 MDL-76666 local_langimport: Better handling of long locales
Under some linux versions, and depending of the configured
locale categories, it's possible to get a current locally
which length > 255 when calling to setlocale(LC_ALL, 0).

Later, if that long locale is tried to be restored, there
is a "setlocale(): Specified locale name is too long" warning
error.

When that happens we need to split the long locale into
individual chunks and set all the (six) locale categories
supported one by one.

Covered with tests, note that, in practice, this only
happens with linux because it supports 12 locale categories
@ OS level. Both BSD (6) and Windows (5) hardly can reach the limit.

No matter of that, the tests have been designed to ensure that
they pass on all OSs, just the new code only will be executed
on linux.
2022-12-14 12:24:15 +01:00
Paul Holden f550239e78 MDL-75177 reportbuilder: preload context data for column callback.
Improve performance/reduce query count by requesting all necessary
data as part of initial column SQL. See also dc60fe66.
2022-12-14 09:52:55 +00:00
Sara Arjona dd83fb0bba Merge branch 'MDL-75441-master' of https://github.com/aanabit/moodle 2022-12-14 09:57:03 +01:00
Anupama Sarjoshi 89287ec744 MDL-76026 Question bank: Fix errors related to categories renaming
This part of the code in 'question_category_object.php' 'update_category' method was used before Moodle 4.0 version for renaming
the random questions in an updated category. For Moodle 4.0 and later versions, it is unnecessary as the details of
random questions are no more stored in 'question' table but in 'question_set_references' table.
The method call move_question_set_references handles the same.
2022-12-13 18:16:52 +00:00
Amaia Anabitarte 31d84aaa2c MDL-75441 mod_forum: Show add new post button to guest users 2022-12-13 18:49:53 +01:00
Tim Hunt 9efec07f77 MDL-74923 quiz: move admin setting classes to mod_quiz\admin namespace 2022-12-13 16:24:58 +00:00
Tim Hunt 48ffa04076 MDL-74923 quiz: tidy qubaids classes
Including removing an almost duplicate task
2022-12-13 16:24:58 +00:00
Tim Hunt 066b7f33d7 MDL-74923 quiz: move qubaids_for_quiz & ..._user to classes folder 2022-12-13 16:24:57 +00:00
Tim Hunt 3e05d77874 MDL-74923 quiz: clean up the display_options class 2022-12-13 16:24:57 +00:00
Tim Hunt cefbf74d02 MDL-74923 quiz: move mod_quiz_display_options to classes folder 2022-12-13 16:24:57 +00:00
Sara Arjona 70c3a5a4ad Merge branch 'MDL-73503-master' of https://github.com/sh-csg/moodle 2022-12-13 15:34:22 +01:00
Paul Holden b67b4791b5 MDL-76667 forms: mark modal form as submitted upon success.
Ensure the form change checker module doesn't warn user about it.
2022-12-13 14:22:47 +00:00
Andrew Nicols c6e9959a40 Merge branch 'MDL-76235' of https://github.com/paulholden/moodle 2022-12-13 20:56:32 +08:00
Andrew Nicols 21e2972b38 Merge branch 'MDL-74874' of https://github.com/uzimike/moodle 2022-12-13 20:34:34 +08:00
Andrew Nicols c198147268 Merge branch 'MDL-76509-master' of https://github.com/safatshahin/moodle 2022-12-13 20:30:57 +08:00
Andrew Nicols 3218a8feda Merge branch 'MDL-76536' of https://github.com/paulholden/moodle 2022-12-13 11:38:06 +08:00
Andrew Nicols 983fadf268 MDL-76293 gradebook: Address coding violations
This includes a data provider which had the 'test_' prefix and was
therefore run as a test.
2022-12-13 11:05:36 +08:00
Andrew Nicols 3c12e4168e Merge branch 'MDL-76293' of https://github.com/mkassaei/moodle 2022-12-13 11:00:30 +08:00
Safat 307f832732 MDL-76509 core: Upgrade error resolve for slot tags 2022-12-13 12:45:32 +11:00
Shamiso.Jaravaza 05d5d089ee MDL-74779 mod_bigbluebuttonbn: Fix recording sort
AMOS BEGIN
 MOV [config_recordings_sortorder,mod_bigbluebuttonbn],[config_recordings_asc_sort,mod_bigbluebuttonbn]
 MOV [config_recordings_sortorder_description,mod_bigbluebuttonbn],[config_recordings_asc_sort_description,mod_bigbluebuttonbn]
AMOS END
2022-12-12 13:34:44 -07:00
Stefan Hanauska e6753b2e95 MDL-73503 report: Add filtering by section to report_progress 2022-12-12 21:12:02 +01:00
Sara Arjona b5e2829f66 Merge branch 'MDL-75594-master' of https://github.com/sh-csg/moodle 2022-12-12 17:58:30 +01:00
Sara Arjona 86218ccb3d Merge branch 'MDL-72451_master' of https://github.com/marxjohnson/moodle 2022-12-12 17:34:07 +01:00
Stefan Hanauska 6378a41995 MDL-75594 course: Add beforemod parameter 2022-12-12 14:39:53 +01:00
hieuvu 0f5c8f020d MDL-76106 qtype_ddmarker: fix the missing maker issue.
We will not calculate old maker position again and using old data.
This will make sure the position of makers is correct
when the background image is smaller than dropzone.
2022-12-12 20:32:43 +07:00
Andrew Nicols 82fe292772 Merge branch 'MDL-71261' of https://github.com/timhunt/moodle 2022-12-12 21:20:56 +08:00
Rex Lorenzo ebeaa4b3f2 MDL-71261 mod_quiz: Quiz user override should only get enrolled users
Also update similar code in mod_assign to use the improved APIs.

Co-Authored-By: Tim Hunt <T.J.Hunt@open.ac.uk>
2022-12-12 12:29:19 +00:00
Sara Arjona 346db64871 Merge branch 'MDL-75571' of https://github.com/jacdsouza/moodle 2022-12-12 11:23:12 +01:00
Khoa Nguyen Dang 315efa2db2 MDL-76308 Question\D&D: The draggable area is slim characters to select 2022-12-12 14:02:56 +07:00
Andrew Nicols 19d1fb336c Merge branch 'MDL-76398' of https://github.com/paulholden/moodle 2022-12-11 20:20:02 +08:00
Andrew Nicols a98bc10c57 Merge branch 'm42_MDL-72461_Moodle_JS_Files_Should_Be_Always_Served_By_JS_Handler' of https://github.com/scara/moodle 2022-12-11 20:08:09 +08:00
Jackson D'souza 4c5b4003c3 MDL-75571 tool_componentlibrary: Custom activity icon 2022-12-09 15:53:23 +00:00
Jackson D'souza aa3efc27ff MDL-75571 theme_boost: Activity icon
* Use Activity get_icon_url helper method to fetch icon.
2022-12-09 15:53:23 +00:00
Jackson D'souza 771b587a54 MDL-75571 block_timeline: Display custom activity icon if available. 2022-12-09 15:53:23 +00:00
Jackson D'souza 3d05ebca36 MDL-75571 calendar: Activity icon
* Use Activity get_icon_url helper method to fetch icon.
2022-12-09 15:53:23 +00:00
Sara Arjona 9d6eecb4ae Merge branch 'MDL-76274-master' of https://github.com/cameron1729/moodle 2022-12-09 16:18:00 +01:00
Matteo Scaramuccia 71883c2add MDL-72461 core: Required JS files in $PAGE served by the Moodle handler 2022-12-09 13:47:19 +01:00
Paul Holden 7bab1754c4 MDL-76536 enrol: prevent invalid role assignments in course creation.
Upgrade step to fixup existing bad data.
2022-12-09 11:38:41 +00:00
Paul Holden 253c041297 MDL-75805 admin: allow multiselect when editing site administrators. 2022-12-09 11:22:07 +00:00
Paul Holden 652b2e496a MDL-76235 core: compare email diversion exceptions case-insensitively.
Co-authored-by: Jan Kristoffer Roth <roth@dhbw-mosbach.de>
2022-12-09 11:19:18 +00:00
Eloy Lafuente (stronk7) 28937d4243 MDL-71096 core: Add meta information about APIs to core
Right now we have the information only in docs:
  - https://docs.moodle.org/dev/Core_APIs
  - https://moodledev.io/docs/apis

And, in fact, we are crawling those pages to get the information
from various tools (moodlecheck, CiBoT...). Obviously, that's far
from ideal, the source only has the current list of APIs, and
there isn't much information there but the names.

So we are moving the source of information to be in core, so it
can be modified between branches, and contains richer information:
 - The component the API belongs to, usually a subsystem or core.
 - If the API can be used as level 2 namespace.
 - If the API can be used as level 2 namespace out from its component.

Note that all that information has NO USES right now in core (and maybe
never will), but tools/checkers will benefit enormously by having that
information at hand, so we can check for namespaces, categories and
other bits way better.

Also, once we have this, the APIs dev documents linked above, surely
can be improved by being automatically generated and include all the
meta-information available.

It also includes a very basic json schema validating the basis. It can
be tried online @ https://www.jsonschemavalidator.net , or any other
tool. PHP requires extra libraries to be able to perform the validation.

Covered with unit tests, both api-related functions and structure validation.
2022-12-09 10:49:12 +01:00
Sara Arjona 40a89d8a9a weekly release 4.2dev 2022-12-09 08:56:53 +01:00
Jun Pataleta ae2a313c95 Merge branch 'MDL-76556-master' of https://github.com/andrewnicols/moodle 2022-12-08 10:07:52 +08:00
Andrew Nicols 6982caf746 Merge branch 'MDL-76491' of https://github.com/paulholden/moodle 2022-12-08 08:08:19 +08:00
Andrew Nicols 1e594c9777 Merge branch 'MDL-76550' of https://github.com/AnupamaSarjoshi/moodle 2022-12-08 07:53:09 +08:00
Andrew Nicols 7aeb1f68e9 Merge branch 'MDL-76074-master' of https://github.com/srobotta/moodle 2022-12-08 07:26:24 +08:00
Andrew Nicols bf5efe9d0b Merge branch 'MDL-76116-master' of https://github.com/meirzamoodle/moodle 2022-12-08 06:14:24 +08:00
Sara Arjona 81a7a50ff1 Merge branch 'MDL-75588-master' of https://github.com/HuongNV13/moodle 2022-12-07 19:31:04 +01:00
Sara Arjona ec3a401015 Merge branch 'MDL-76575-master' of https://github.com/HuongNV13/moodle 2022-12-07 18:32:13 +01:00
Sara Arjona d66ca7decc Merge branch 'MDL-76500' of https://github.com/paulholden/moodle 2022-12-07 18:27:46 +01:00
Trevor Jones c49806941c MDL-72906 Quiz: Prevent scrollbar on multichoice
Remove negative margin from the "clear my choice" anchor.
With the negative margin, when the containing box height is calculated
the anchor's hidden style overflows beyond the boundary and triggers
the overflow:auto to add a scroll bar.
2022-12-07 10:24:34 -07:00
Sara Arjona 315f1dafd8 Merge branch 'MDL-76193-master' of https://github.com/JBThong/moodle 2022-12-07 17:26:11 +01:00
Sara Arjona 592de63edb Merge branch 'MDL-76571' of https://github.com/timhunt/moodle 2022-12-07 17:17:23 +01:00
Tim Hunt 83c9a6d311 MDL-76571 quiz reports: should not show description items
... or anything else with length = 0. This got broken in MDL-71696.

The only way to fix this kind-of involves and API change to
quiz_report_get_significant_questions. However, it is only changing
the external API of this function back to how it was before the 4.0 release,
and the chnages in 4.0 were never documented, nor, I would guess, intended,
since they just broke things.
2022-12-07 14:54:40 +00:00
Jun Pataleta 5935cd22c1 Merge branch 'MDL-76559-master' of https://github.com/andrewnicols/moodle 2022-12-07 22:41:20 +08:00
Andrew Nicols 7ce68020b8 MDL-76559 core: validate_email does not take false either 2022-12-07 21:40:18 +08:00
Sara Arjona 1cfa7fc788 Merge branch 'MDL-76273' of https://github.com/paulholden/moodle 2022-12-07 12:51:08 +01:00
Huong Nguyen e1001e2f26 MDL-75588 assign: Reset completion status when resetting a submission 2022-12-07 16:15:30 +07:00
Huong Nguyen dd6349c39f MDL-76575 tiny_media: Remove unnecessary console log 2022-12-07 15:50:01 +07:00
Jun Pataleta 51d1448b06 Merge branch 'MDL-73017_add-environment-check-for-versions-not-supporting-php-8-1' of https://github.com/ziegenberg/moodle 2022-12-07 13:47:04 +08:00
Meirza 883c1becc5 MDL-76116 mnet: styling the delete key confirmation window properly 2022-12-07 11:14:05 +07:00
Jun Pataleta 5bc72f5176 Merge branch 'MDL-76559-master' of https://github.com/andrewnicols/moodle 2022-12-06 23:19:53 +08:00
Andrew Nicols f375cac31a MDL-76559 core: validate_email should not accept empty values 2022-12-06 20:53:30 +08:00
Jun Pataleta daa506a037 Merge branch 'MDL-76476' of https://github.com/paulholden/moodle 2022-12-06 19:34:40 +08:00
Jun Pataleta ab10635ef1 Merge branch 'MDL-75381' of https://github.com/paulholden/moodle 2022-12-06 19:24:41 +08:00
Ilya Tregubov e641428826 Merge branch 'MDL-76490' of https://github.com/paulholden/moodle 2022-12-06 13:09:21 +03:00
Paul Holden 7906f48c6f MDL-76500 grade: fix grade form when item cannot be overridden. 2022-12-06 09:20:09 +00:00
Ilya Tregubov aaa20901b2 Merge branch 'MDL-76446' of https://github.com/paulholden/moodle 2022-12-06 12:18:52 +03:00
Mahmoud Kassaei 20d2752f93 MDL-76293 Gradebook: PHPUnit fails when plugins are not expected 2022-12-06 08:34:50 +00:00
Cameron Ball 3c67e41d0e MDL-76274 assignfeedback_editpdf: Fix upgrade step for stale conversions 2022-12-06 16:00:26 +08:00
Ilya Tregubov ac60253859 Merge branch 'MDL-75516' of https://github.com/larsbonczek/moodle 2022-12-06 10:37:46 +03:00
Andrew Nicols c69902f846 Merge branch 'MDL-75446-master' of https://github.com/andelacruz/moodle 2022-12-06 15:15:48 +08:00
Andrew Nicols 425d4f2583 Merge branch 'MDL-75573' of https://github.com/paulholden/moodle 2022-12-06 13:54:26 +08:00
Andrew Nicols 3365e5a4e6 Merge branch 'MDL-76145-master' of https://github.com/meirzamoodle/moodle 2022-12-06 13:35:46 +08:00
Paul Holden 79bd94089f MDL-76273 core: multi-byte character filename support for TCPDF.
See: https://github.com/tecnickcom/TCPDF/pull/562
2022-12-05 15:03:15 +00:00
Paul Holden 23930c2516 MDL-76490 behat: use defined step for interaction with autocomplete. 2022-12-05 14:02:33 +00:00
Marina Glancy 8d86f30351 MDL-76490 behat: correct step for opening autocomplete in container. 2022-12-05 14:01:55 +00:00
Andrew Nicols aea298513e MDL-76569 editor_tiny: Set table row header style
Configure Tiny to use markup of:

table > thead > tr > th

For all table headers.
2022-12-05 20:49:17 +08:00
Sara Arjona 46114474e4 Merge branch 'MDL-75789' of https://github.com/paulholden/moodle 2022-12-05 12:53:36 +01:00
Anupama Sarjoshi 9e77d14a7b MDL-76550 Quiz and qbank: Fix display of Category and question names 2022-12-05 11:48:43 +00:00
Sara Arjona d5b3abde3c Merge branch 'MDL-76166-username-logging' of https://github.com/brendanheywood/moodle 2022-12-05 12:44:17 +01:00
Ilya Tregubov ff871829c5 Merge branch 'MDL-75788-master' of https://github.com/lameze/moodle 2022-12-05 14:31:16 +03:00
Sara Arjona 474f92910a Merge branch 'MDL-76482-master' of https://github.com/andrewnicols/moodle 2022-12-05 12:03:57 +01:00
Daniel Ziegenberg afe68a65cb MDL-73017 env: Moodle 3.9.x, 3.11.x and 4.0.x do not support PHP 8.1
This commit adds an additional environment check for the unsupported
PHP 8.1 version to Moodle 3.9.x, 3.11.x and 4.0.x.

It also updates the lang string for unsupported PHP version.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2022-12-05 11:39:14 +01:00
Angelia Dela Cruz 11caf95cb9 MDL-75446 behat: Workshop behat generators use UI
Replace steps that manually add Workshop instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2022-12-05 16:09:05 +08:00
Paul Holden aa1970ffa4 MDL-76479 reportbuilder: date filtering by hour. 2022-12-05 06:50:07 +00:00
Ilya Tregubov ea8710f2c9 Merge branch 'MDL-76330-master' of https://github.com/sh-csg/moodle 2022-12-05 09:21:09 +03:00
Jun Pataleta e07adad35f Merge branch 'MDL-76225-master' of https://github.com/ferranrecio/moodle 2022-12-05 13:47:44 +08:00
Thong Bui 79d1b45ba7 MDL-76193 Questions: Backup and Restore with tags fails 2022-12-05 10:00:37 +07:00
Andrew Nicols a8f63b26be MDL-76556 tool_log: Set the store property correctly 2022-12-03 11:47:53 +08:00
Lars Bonczek e875c6118c MDL-75516 core: Perform proper JSON encoding in mustache quote helper 2022-12-02 13:39:58 +01:00
Ilya Tregubov fb27e80566 Merge branch 'MDL-76495-master' of https://github.com/marinaglancy/moodle 2022-12-02 13:48:11 +03:00
Paul Holden 077a30b7ff MDL-76491 javascript: add missing core/notification imports. 2022-12-02 10:05:28 +00:00
Paul Holden bc034026ed MDL-76491 javascript: prevent eslint undefined Notification import. 2022-12-02 10:05:28 +00:00
Paul Holden cccddcd7c0 MDL-76398 reportbuilder: use improved action menu steps in Behat.
Improved steps for using actions menus were added in 232ebac3, so
make use of them here for consistency/reliability.
2022-12-02 09:54:49 +00:00
Paul Holden e2a2332cc0 MDL-76398 behat: broader action menu partial matching by element.
For action menu elements whose trigger element isn't plain text
(e.g. a pix icon), we should be able to match via the title of
that element.
2022-12-02 09:54:49 +00:00
hieuvu ff342087da MDL-76106 qtype_ddmarker: Improve loading consistency.
Wait for the image to load completely before running the js.
2022-12-02 16:14:23 +07:00
Ilya Tregubov 357a937790 Merge branch 'MDL-75951-master' of https://github.com/andrewnicols/moodle 2022-12-02 11:55:35 +03:00
Stephan Robotta ecc6b31176 MDL-76074 completion: fixed filter in reports with custom user fields
When the site uses custom user text fields that would show up in a
user list, the filter for firstname or lastname didnt work anymore.
If a filter was used, no result would show up. Users where shown only
when the course reports where used without filters.
2022-12-02 09:42:35 +01:00
Dani Palou 6ab826fb23 MDL-75788 behat: Use profile field generators in existing tests 2022-12-02 14:54:47 +08:00
Dani Palou 3923ef9408 MDL-75788 testing: Handle new lines in menu profile field generator 2022-12-02 14:54:46 +08:00
Andrew Nicols fad9666817 MDL-75951 core: Update box/spout to address PHP 8.1 deprecation
This change is a direct pull from an upstream fix:
https://github.com/openspout/openspout/commit/64a09a748d04992d63b38712599a9d8742bd77f7

This addresses the deprecation of auto_detect_line_endings in PHP 8.1.
2022-12-02 13:58:05 +08:00
Ilya Tregubov e925e2984a Merge branch 'MDL-76494-master' of https://github.com/marinaglancy/moodle 2022-12-02 08:40:57 +03:00
Andrew Nicols 8ddbc7b055 Merge branch 'MDL-76493-master' of https://github.com/marinaglancy/moodle 2022-12-02 12:15:20 +08:00
Paul Holden be83010d4f MDL-75573 backup: translate async operation type in messages. 2022-12-01 19:48:29 +00:00
Stefan Hanauska d602d936ac MDL-76330 enrol: Check permission to show edit icon 2022-12-01 20:07:15 +01:00
Sara Arjona 1d863c338a weekly on-sync release 4.2dev 2022-12-01 16:08:29 +01:00
Sara Arjona 7418832f75 NOBUG: Fixed file access permissions 2022-12-01 16:08:29 +01:00
Simey Lameze 1531541451 MDL-76507 behat: change step to use 'Recent and next 60 days' option
It was detected that 'This month' option may cause failures in builds in between months
so using the 'Recent and next 60 days' still fixes the weekend scenario and also the
in between months issue.
2022-12-01 08:50:58 +01:00
Andrew Nicols e5f97c07cc Merge branch 'MDL-75604-master' of https://github.com/ssj365/moodle 2022-12-01 08:56:15 +03:00
Andrew Nicols dc3c0bbec3 Merge branch 'MDL-75281-master' of https://github.com/call-learning/moodle 2022-12-01 08:56:15 +03:00
Ilya Tregubov 05535e38df Merge branch 'MDL-76497-master' of https://github.com/junpataleta/moodle 2022-12-01 08:56:09 +03:00
Sara Arjona 919302aa1a Merge branch 'MDL-76226' of https://github.com/paulholden/moodle 2022-12-01 08:55:34 +03:00
Sara Arjona 58e7efd8d7 Merge branch 'MDL-76507-401' of https://github.com/lameze/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta 17c5b5f232 Merge branch 'MDL-76250' of https://github.com/paulholden/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta 3947ad99c1 Merge branch 'MDL-76483-master' of https://github.com/andrewnicols/moodle 2022-12-01 08:55:34 +03:00
Ilya Tregubov 9ba9589f09 Merge branch 'MDL-74853-master' of https://github.com/marinaglancy/moodle 2022-12-01 08:55:34 +03:00
Ilya Tregubov ad2b1af12b Merge branch 'MDL-76487-master' of https://github.com/andrewnicols/moodle 2022-12-01 08:55:34 +03:00
Andrew Nicols 3a62d00b28 Merge branch 'MDL-75826-master' of https://github.com/meirzamoodle/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta bc0c11a191 Merge branch 'MDL-68981-master' of https://github.com/HuongNV13/moodle 2022-12-01 08:55:34 +03:00
Andrew Nicols 0646f7ea5a Merge branch 'MDL-76183-master' of https://github.com/davewoloszyn/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta 760e29e2de Merge branch 'MDL-76284' of https://github.com/paulholden/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta ef089741f4 Merge branch 'MDL-76429' of https://github.com/stronk7/moodle 2022-12-01 08:55:34 +03:00
Andrew Nicols cd723a9bc1 Merge branch 'MDL-76380' of https://github.com/paulholden/moodle 2022-12-01 08:55:34 +03:00
Andrew Nicols b1e77fe1f3 Merge branch 'MDL-76218-master' of https://github.com/sammarshallou/moodle 2022-12-01 08:55:34 +03:00
Jun Pataleta 85e8177eac Merge branch 'MDL-75977' of https://github.com/stronk7/moodle 2022-12-01 08:55:33 +03:00
Andrew Nicols a4ad23b855 Merge branch 'MDL-76127-master' of https://github.com/meirzamoodle/moodle 2022-12-01 08:55:33 +03:00
Ilya Tregubov 72145fc34d Merge branch 'MDL-72019-master' of https://github.com/meirzamoodle/moodle 2022-12-01 08:55:33 +03:00
Laurent David e9844e380c MDL-75281 mod_bigbluebuttonbn: Upgrade failure when table exists
* Fix several upgrade script issue when the recording table exists or plugin has been
downgraded prior to 4.x upgrade
2022-11-30 20:17:13 +01:00
Shamiso.Jaravaza 4d64f23395 MDL-75604 mod_bigbluebuttonbn: Fix welcome section
* Removed welcome message from General settings
* Cleaned settings.php file to remove hardcoded add($item) after adding conditional element
2022-11-30 11:42:28 -07:00
Ferran Recio 8cb0c44e17 MDL-76225 core_courseformat: fix section title id 2022-11-30 16:44:48 +01:00
Marina Glancy 8bababa369 MDL-76494 libs: patch Box::Spout for PHP 8.1 - calling basename on null 2022-11-30 10:30:34 +01:00
Andrew Nicols 6ab3740eb4 MDL-76482 output: The javascript mustache helper should return a string 2022-11-30 12:18:32 +08:00
Huong Nguyen 45e3d815b0 MDL-68981 tool_recyclebin: Force necessary settings when restoring
Created code to force the necessary settings for restore_item in:
  + course_bin class
  + category_bin class
2022-11-30 10:16:53 +07:00
David Woloszyn 126028cc76 MDL-76183 lib: Update Github URLs 2022-11-30 14:01:31 +11:00
Meirza ed5db9e301 MDL-76145 course: Avoid long course names that exceed available space
Co-authored-by: Stephen Sharpe <stephen.sharpe@synergy-learning.com>
2022-11-30 09:45:47 +07:00
Brendan Heywood d3789541ab MDL-76166 calendar: Ensure user is in server access logs 2022-11-30 13:25:21 +11:00
Brendan Heywood 825d11ec50 MDL-76166 auth: Ensure user is in server access logs 2022-11-30 13:25:20 +11:00
Jonathan Champ a45c8120c9 MDL-76506 cache_application: Fix MDL_PERF and perfdebug checks 2022-11-29 13:27:31 -05:00
Paul Holden 347bb143e7 MDL-76446 user: correct logic for multiple keyword search.
When the keyword participant filter was used with multiple values
in conjunction with other participants filters, the boolean logic
was effectively:

 X AND Y OR Z

When what we actually wanted was:

 X AND (Y OR Z)
2022-11-29 16:30:35 +00:00
Paul Holden e82198daf9 MDL-76476 tiny_media: don't load image preview if none exists. 2022-11-29 16:27:38 +00:00
Ilya Tregubov 08fc4f9589 Merge branch 'MDL-75463-master' of https://github.com/kevpercy/moodle 2022-11-29 13:24:43 +03:00
Andrew Nicols 62b6e49143 Merge branch 'MDL-76355-master' of https://github.com/marinaglancy/moodle 2022-11-29 17:29:49 +08:00
Andrew Nicols 14d8b7cf82 Merge branch 'MDL-75960-master' of https://github.com/andelacruz/moodle 2022-11-29 17:04:31 +08:00
Paul Holden 33c1fb4445 MDL-75381 gradereport_grader: ensure valid paging preference value.
Set type of the report paging setting to integer, to ensure usage
of it is predictable. Unsupported operated type errors were thrown
on PHP8.0 when it's value contained a string or was empty.
2022-11-29 08:41:33 +00:00
Paul Holden e5c6575bbd MDL-75789 restore: multi-byte safe substring calculating course names.
Co-authored-by: Leon Stringer <leon.stringer@ntlworld.com>
2022-11-29 08:32:22 +00:00
Andrew Nicols 9e2051931f Merge branch 'MDL-74823_upgrade-html-purifier-to-4-14-0' of https://github.com/ziegenberg/moodle 2022-11-29 16:24:31 +08:00
Andrew Nicols f4053b291b Merge branch 'MDL-65939-master' of https://github.com/ewallah/moodle 2022-11-29 15:41:14 +08:00
Andrew Nicols ab44f00548 Merge branch 'MDL-76058-master' of https://github.com/lameze/moodle 2022-11-29 15:36:55 +08:00
Andrew Nicols 5609715e6e Merge branch 'MDL-76088-master' of https://github.com/marinaglancy/moodle 2022-11-29 15:09:27 +08:00
Andrew Nicols b4797f9959 Merge branch 'MDL-74454-master' of https://github.com/pabloamayab/moodle 2022-11-29 14:15:35 +08:00
Jun Pataleta f05944d660 Merge branch 'MDL-76496' of https://github.com/stronk7/moodle 2022-11-29 13:49:39 +08:00
Andrew Nicols 360e16fd8b MDL-76258 mod_lti: Codign style fixes 2022-11-29 12:28:35 +08:00
Andrew Nicols 392a0030a3 Merge branch 'MDL-76258-master' of https://github.com/sh-csg/moodle 2022-11-29 12:27:53 +08:00
Andrew Nicols 56303564c6 MDL-69570 assignfeedback_editpdf: Whitespace fix 2022-11-29 11:49:24 +08:00
Andrew Nicols ebd0cb2eb9 Merge branch 'MDL-69570-master' of https://github.com/abgreeve/moodle 2022-11-29 11:38:36 +08:00
Adrian Greeve c694b57b35 MDL-69570 assignfeedback_editpdf: Upgrade step to remove files.
This upgrade step removes all orphaned editpdf feedback files and
records.
2022-11-29 09:41:30 +08:00
Adrian Greeve a39d00389a MDL-69570 assignfeedback_editpdf: Remove temp pdf files
This adds a new method to the assignfeedback edit pdf library
to specify user data file areas that will return just the meaningful
annotated feedback pdf.

get_file_areas has been updated for this plugin to return all
file areas related to assignfeedback_editpdf, and should stop
producing orphaned files and records when a course reset is done.

Thanks to @toniginard who provided a base solution for me to work
off.
2022-11-29 09:35:51 +08:00
Jonathan Champ 33e3af1899 MDL-76506 core\lock: Fix MDL_PERF and perfdebug checks 2022-11-28 18:53:44 -05:00
Mark Holliday 3476cccf38 MDL-76376 scorm: fix PHP8 TypeError (null is not Countable) 2022-11-28 17:51:07 -05:00
Paul Holden e0d7ab9989 MDL-76380 tool_oauth2: remove double persistent load on update.
The method already loaded the validated persistent model data on the
previous line, there's no need to do it again (while also trying to
load unvalidated properties).
2022-11-28 19:38:47 +00:00
Paul Holden c2d26f8a7b MDL-76250 mod_assign: disable form change checker for grading options.
This was previously fixed in 8e9efe60, but seems to have regressed
somewhere along the way.
2022-11-28 16:06:55 +00:00
Paul Holden 23df60893a MDL-76226 admin: account for preset config checkboxes other than bool.
The assumption that the settings checkbox always stores boolean values
(e.g. 0/1) isn't correct. The `perfdebug` configuration instead uses
the values 7/15.
2022-11-28 16:04:08 +00:00
Marina Glancy a800e7e62f MDL-74853 various: add second parameter to htmlentities functions
Default value of the $flag argument changed in PHP 8.1 from ENT_COMPAT to ENT_QUOTES | ENT_SUBSTITUTE
To ensure consistent behavior across different PHP version the second parameter is now required for the functions:
htmlspecialchars(), htmlentities(), htmlspecialchars_decode(), html_entity_decode() and get_html_translation_table()
2022-11-28 16:12:20 +01:00
Marina Glancy 2d0b8c9282 MDL-76495 libs: patch TCPDF for PHP 8.1 compatibility 2022-11-28 16:01:47 +01:00
Marina Glancy c1dec1d2f4 MDL-76494 libs: patch Box::Spout for PHP 8.1 compatibility 2022-11-28 15:56:35 +01:00
Paul Holden f8ef28f9a6 MDL-76284 webservice: early exit if no users for missing capabilities. 2022-11-28 11:52:45 +00:00
Andrew Nicols 3125eb732b MDL-76487 tiny_autosave: Clarify autosave store rejection message 2022-11-28 19:42:12 +08:00
Andrew Nicols d907d5ccb1 MDL-76487 tiny_autosave: Use navigator.sendBeacon instead of fetch
Firefox does not support the keepalive flag for fetch, despite every
other browser except IE supporting it.
2022-11-28 19:42:12 +08:00
Marina Glancy b99a931f7f MDL-76355 lib: apply a patch to googleapi for php 8.1 compatibility 2022-11-28 12:00:51 +01:00
Marina Glancy 130d371ccf MDL-76088 blocks: fixed incorrect use of static cache 2022-11-28 11:58:47 +01:00
Meirza 934d74a6ff MDL-75826 profile: Redirect to profile page if returnto is profile. 2022-11-28 16:13:14 +07:00
Jun Pataleta c6ab792ddf MDL-76497 upgrade: add the 4.1.0 separation line to all upgrade scripts 2022-11-28 14:43:04 +08:00
Huong Nguyen e4fde5a93e MDL-68981 tool_recyclebin: Extra PHPUnit with General restore config 2022-11-28 09:33:36 +07:00
Huong Nguyen d1fab0c619 MDL-68981 tool_recyclebin: Extra Behat test with General restore config
Including in this commit:
 - Convert existing Behat scenario to use Data generators
 - Convert existing Behat scenario to use Provider
 - Add new scenario for Include users setting in General restore page
2022-11-28 09:33:36 +07:00
Angelia Dela Cruz 7b8aa2c64e MDL-75960 behat: Survey behat generators use UI
Replace steps that manually add Survey instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2022-11-28 09:32:09 +08:00
Eloy Lafuente (stronk7) b2ffea4ac0 MDL-76496 backup: Bump release to 4.2 2022-11-26 23:56:08 +01:00
Marina Glancy 369bca652c MDL-76495 lib: test for qrcode in TCPDF 2022-11-26 19:18:29 +01:00
Marina Glancy d2e5bfe26f MDL-76494 core_reportbuilder: behat test for downloading report 2022-11-26 18:31:21 +01:00
Eloy Lafuente (stronk7) 9e58ce1182 MDL-76429 composer: Bump to phpwebdriver 1.2.1 for php81 compat
Note this comes with a bunch of other small updates, all them
pretty minor and should not be problematic. Better we get them
than keeping them apart.
2022-11-26 16:16:25 +01:00
Eloy Lafuente (stronk7) eeaaf131ac MDL-75977 xmldb: Avoid using null params on built-in DB functions
This changes a couple of cases, in postgres and oracle where we
were trying to calculate strlen() on null values (that causes a
PHP 8.1 warning).

Also, at the same time, fixing another case in xmldb_field, it
was detected that it had a bug around precision (being set to the
value of type), being used as object property, when it's not, so
it was also fixed by moving the code logic a little bit.

Note that the bug has been there since inception because there
isn't any code in Moodle using that ->precision property. It
was just detected thanks to PHP 8.2, but that's another story. :-)

Verified that with the patch:
- All DBs can be installed (phpunit install)
- Both DDL and DML pass without any ddl/dml warning (in all DBs).
2022-11-26 16:16:20 +01:00
Marina Glancy 6c30e11dbb MDL-76494 dataformat: tests for Excel and ODS writers 2022-11-26 15:21:52 +01:00
Stefan Hanauska b8a0ac4808 MDL-76258 mod_lti: Reset clientid after restore 2022-11-26 14:38:47 +01:00
Marina Glancy e5f862d0b1 MDL-76493 core: make sure format_string(null) works on PHP 8.1 2022-11-26 14:02:32 +01:00
Jun Pataleta 57c1e97bf1 weekly back-to-dev release 4.2dev 2022-11-26 17:35:00 +08:00
Jun Pataleta 4468b03cd5 NOBUG: Change travis.yml back to master 2022-11-26 17:23:04 +08:00
Andrew Nicols 6eccbc7af5 MDL-76483 core: Handle default value for get_docs_url() 2022-11-25 22:19:04 +08:00
Meirza 409e1fc194 MDL-76127 Profiling: Make the breadcrumb of the profiling URL clickable
Boost has the behavior to remove the last item action.
To avoid that, we need to add an action item.
2022-11-21 14:06:07 +07:00
Kevin Percy a1f4f514d4 MDL-75463 lib: Update Bennu version number to 0.2 2022-11-18 16:37:10 +08:00
Daniel Ziegenberg 877ac800cd MDL-74823 lib: HTMLPurifier upgrade to 4.16.0
Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2022-11-17 18:26:28 +01:00
Daniel Ziegenberg be7f6d4834 MDL-74823 lib: normalize line endings for HTMLPurifier
Prior to this change, all the line endings in the imported HTMLPurifier
library were using CRLF (\r\n aka Windows style), but the HTMLPurifier
source and also the downloadable artefacts use LF (\n aka Linux style)
as line endings. This has been the case since
510d190382 when with the commit
"MDL-38672 import HTML Purifier 4.5.0" all line endings were changed
from LF to CRLF. There was no comment in the commit on why this change
was done.

As the original source uses LF, this commit partly reverts
510d190382 and goes back to LF as line
endings.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2022-11-17 18:26:26 +01:00
Daniel Ziegenberg 90f8efa6b3 MDL-74823 lib: HTMLPurifier upgrade to 4.14.0
Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2022-11-17 18:26:14 +01:00
info@eWallah.net 1f16e9b76f MDL-65939 phpunit: Maildigest tests can query a wrong adhoc task 2022-11-17 15:54:58 +01:00
Meirza 7760f1bf34 MDL-72019 user: Allows data to be formatted when exporting. 2022-11-17 16:28:09 +07:00
Tomo Tsuyuki b3e046df7e MDL-72451 core: Stop keep regrading when there is an error
Set needsupdate to finish to avoid regrading each call.
Add error messages for regrading.
Display the error message on the quiz page.

Co-authored-by: Mark Johnson <mark.johnson@catalyst-eu.net>
2022-11-17 08:54:47 +00:00
Kepa Urzelai eae00ca006 MDL-72563 theme_boost: rubric area style fix 2022-11-16 15:42:32 +01:00
michaelkotlyar a8c0258bfe MDL-74874 config: Removed comment "This is an experimental issue". 2022-11-16 16:31:26 +13:00
sam marshall 5f5f922fd8 MDL-76218 cachestore_redis: delete_many can fail with no keys
In some cases, we get an error message such as:

Wrong parameter count for Redis::zRem()

Within the delete_many function. This function requires at least one
key to be supplied, but if delete_many is called with an empty array,
we will call it with no keys.
2022-11-14 14:40:09 +00:00
Simey Lameze ff4292501c MDL-76058 behat: send message using data generator 2022-11-09 09:50:06 +08:00
David Mudrák 3c9ca9007b MDL-75534 Fix usermodified in very old forum discussions
Very early Moodle versions used to leave the field empty. Recent Moodle
versions expect that the value always links to an existing user account.
2022-10-19 20:36:31 +02:00
Pablo Amaya 8cf256648f MDL-74454 mod_scorm: Fixed problems in lateral navigation.
Fixed problems in lateral navigation and grading when
a SCORM has more than three levels

The SCORM module has problems with full screen display,
completion tracking and grading in SCORM.

Also resolves issues MDL-74992, MDL-73249, MDL-75407
2022-10-05 12:40:06 +02:00
9171 changed files with 357559 additions and 310874 deletions
+1
View File
@@ -87,6 +87,7 @@
'no-octal-escape': 'error',
'no-proto': 'error',
'no-redeclare': 'warn',
'no-restricted-globals': ['error', { 'name': 'Notification' }],
'no-return-assign': 'error',
'no-script-url': 'error',
'no-self-assign': 'error',
+12 -9
View File
@@ -9,7 +9,7 @@ on:
- v[0-9]+.[0-9]+.[0-9]+*
env:
php: 8.0
php: 8.1
jobs:
Grunt:
@@ -54,32 +54,35 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-22.04
php: 7.4
extensions:
db: mysqli
# MySQL builds always run with the lowest PHP supported version.
- os: ubuntu-22.04
php: 8.0
extensions:
db: mysqli
# PostgreSQL builds always run with the highest PHP supported version.
- os: ubuntu-22.04
php: 8.1
db: pgsql
extensions: xmlrpc-beta
steps:
- name: Setting up DB mysql
if: ${{ matrix.db == 'mysqli' }}
uses: johanmeiring/mysql-action@tmpfs-patch
uses: moodlehq/mysql-action@v1
with:
collation server: utf8mb4_bin
mysql version: 5.7
mysql version: 8.0
mysql database: test
mysql user: test
mysql password: test
use tmpfs: true
tmpfs size: '1024M'
extra conf: --skip-log-bin
- name: Setting up DB pgsql
if: ${{ matrix.db == 'pgsql' }}
uses: m4nu56/postgresql-action@v1
with:
postgresql version: 12
postgresql version: 13
postgresql db: test
postgresql user: test
postgresql password: test
+144
View File
@@ -0,0 +1,144 @@
name: Windows Testing
on:
workflow_dispatch
env:
php: 8.1
jobs:
Grunt:
runs-on: windows-latest
steps:
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checking out code
uses: actions/checkout@v3
- name: Configuring node & npm
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- name: Installing node stuff
run: npm ci
- name: Running grunt
run: npx grunt
- name: Looking for uncommitted changes
# 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.
# We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
run: |
git add .
git reset -- npm-shrinkwrap.json
git diff --cached --exit-code
PHPUnit:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
php: 8.1
# Ideally we should use mysql/mariadb, but they are 4x slower without tweaks and configuration
# so let's run only postgres (1.5h vs 6h) only, If some day we want to improve the mysql runs,
# this is the place to enable them.
# db: mysqli
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
- os: windows-latest
php: 8.0
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
steps:
- name: Setting up DB mysql
if: ${{ matrix.db == 'mysqli' }}
uses: shogo82148/actions-setup-mysql@v1
with:
mysql-version: 8.0
user: test
password: test
- name: Creating DB mysql
if: ${{ matrix.db == 'mysqli' }}
run: mysql --host 127.0.0.1 -utest -ptest -e 'CREATE DATABASE IF NOT EXISTS test COLLATE = utf8mb4_bin;';
- name: Setting up DB pgsql
if: ${{ matrix.db == 'pgsql' }}
run: |
# TODO: Remove these conf. modifications when php74 or php80 are lowest.
# Change to old md5 auth, because php73 does not support it.
# #password_encryption = scram-sha-256
(Get-Content "$env:PGDATA\postgresql.conf"). `
replace('#password_encryption = scram-sha-256', 'password_encryption = md5') | `
Set-Content "$env:PGDATA\postgresql.conf"
(Get-Content "$env:PGDATA\pg_hba.conf"). `
replace('scram-sha-256', 'md5') | `
Set-Content "$env:PGDATA\pg_hba.conf"
$pgService = Get-Service -Name postgresql*
Set-Service -InputObject $pgService -Status running -StartupType automatic
Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
& $env:PGBIN\psql --command="CREATE USER test PASSWORD 'test'" --command="\du"
- name: Creating DB pgsql
if: ${{ matrix.db == 'pgsql' }}
run: |
& $env:PGBIN\createdb --owner=test test
$env:PGPASSWORD = 'test'
& $env:PGBIN\psql --username=test --host=localhost --list test
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v4
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
coverage: none
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v3
# Needs to be done after php is available, git configured and Moodle checkout has happened.
- name: Setting up moodle-exttests service
run: |
git clone https://github.com/moodlehq/moodle-exttests.git
nssm install php-built-in C:\tools\php\php.exe -S localhost:8080 -t D:\a\moodle\moodle\moodle-exttests
nssm start php-built-in
- name: Setting up redis service
run: |
choco install redis-64 --version 3.0.503 --no-progress
nssm install redis redis-server
nssm start redis
- name: Setting up PHPUnit
env:
dbtype: ${{ matrix.db }}
shell: bash
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
cp .github/workflows/config-template.php config.php
mkdir ../moodledata
php admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Running PHPUnit tests
env:
dbtype: ${{ matrix.db }}
phpunit_options: ${{ secrets.phpunit_options }}
run: vendor/bin/phpunit $phpunit_options
+1 -2
View File
@@ -20,7 +20,6 @@
*~
#
/config.php
/lib/editor/tinymce/extra/tools/temp/
/tags
/TAGS
/cscope.*
@@ -54,5 +53,5 @@ moodle-plugin-ci.phar
/admin/tool/componentlibrary/docs
/admin/tool/componentlibrary/hugo/site/data/my-index.json
.hugo_build.lock
.phpcs.xml
phpcs.xml
jsconfig.json
+151 -1
View File
@@ -156,7 +156,7 @@ const getThirdPartyLibsList = relativeTo => {
* @returns {array}
*/
const getThirdPartyPaths = () => {
const DOMParser = require('xmldom').DOMParser;
const DOMParser = require('@xmldom/xmldom').DOMParser;
const fs = require('fs');
const path = require('path');
const xpath = require('xpath');
@@ -232,6 +232,155 @@ const getOwningComponentDirectory = checkPath => {
return null;
};
/**
* Get the latest tag in a remote GitHub repository.
*
* @param {string} url The remote repository.
* @returns {Array}
*/
const getRepositoryTags = async(url) => {
const gtr = require('git-tags-remote');
try {
const tags = await gtr.get(url);
if (tags !== undefined) {
return tags;
}
} catch (error) {
return [];
}
return [];
};
/**
* Get the list of thirdparty libraries that could be upgraded.
*
* @returns {Array}
*/
const getThirdPartyLibsUpgradable = async() => {
const libraries = getThirdPartyLibsData().filter((library) => !!library.repository);
const upgradableLibraries = [];
const versionCompare = (a, b) => {
if (a === b) {
return 0;
}
const aParts = a.split('.');
const bParts = b.split('.');
for (let i = 0; i < Math.min(aParts.length, bParts.length); i++) {
const aPart = parseInt(aParts[i], 10);
const bPart = parseInt(bParts[i], 10);
if (aPart > bPart) {
// 1.1.0 > 1.0.9
return 1;
} else if (aPart < bPart) {
// 1.0.9 < 1.1.0
return -1;
} else {
// Same version.
continue;
}
}
if (aParts.length > bParts.length) {
// 1.0.1 > 1.0
return 1;
}
// 1.0 < 1.0.1
return -1;
};
for (let library of libraries) {
upgradableLibraries.push(
getRepositoryTags(library.repository).then((tagMap) => {
library.version = library.version.replace(/^v/, '');
const currentVersion = library.version.replace(/moodle-/, '');
const currentMajorVersion = library.version.split('.')[0];
const tags = [...tagMap]
.map((tagData) => tagData[0])
.filter((tag) => !tag.match(/(alpha|beta|rc)/))
.map((tag) => tag.replace(/^v/, ''))
.sort((a, b) => versionCompare(b, a));
if (!tags.length) {
library.warning = "Unable to find any comparable tags.";
return library;
}
library.latestVersion = tags[0];
tags.some((tag) => {
if (!tag) {
return false;
}
// See if the version part matches.
const majorVersion = tag.split('.')[0];
if (majorVersion === currentMajorVersion) {
library.latestSameMajorVersion = tag;
return true;
}
return false;
});
if (versionCompare(currentVersion, library.latestVersion) > 0) {
// Moodle somehow has a newer version than the latest version.
library.warning = `Newer version found: ${currentVersion} > ${library.latestVersion} for ${library.name}`;
return library;
}
if (library.version !== library.latestVersion) {
// Delete version and add it again at the end of the array. That way, current and new will stay closer.
delete library.version;
library.version = currentVersion;
return library;
}
return null;
})
);
}
return (await Promise.all(upgradableLibraries)).filter((library) => !!library);
};
/**
* Get the list of thirdparty libraries.
*
* @returns {Array}
*/
const getThirdPartyLibsData = () => {
const DOMParser = require('@xmldom/xmldom').DOMParser;
const fs = require('fs');
const xpath = require('xpath');
const path = require('path');
const libraryList = [];
const libraryFields = [
'location',
'name',
'version',
'repository',
];
const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
thirdpartyfiles.forEach(function(libraryPath) {
const xmlContent = fs.readFileSync(libraryPath, 'utf8');
const doc = new DOMParser().parseFromString(xmlContent);
const libraries = xpath.select("/libraries/library", doc);
for (const library of libraries) {
const libraryData = [];
for (const field of libraryFields) {
libraryData[field] = xpath.select(`${field}/text()`, library)?.toString();
}
libraryData.location = path.join(path.dirname(libraryPath), libraryData.location);
libraryList.push(libraryData);
}
});
return libraryList.sort((a, b) => a.location.localeCompare(b.location));
};
module.exports = {
fetchComponentData,
getAmdSrcGlobList,
@@ -241,4 +390,5 @@ module.exports = {
getYuiSrcGlobList,
getThirdPartyLibsList,
getThirdPartyPaths,
getThirdPartyLibsUpgradable,
};
+8 -6
View File
@@ -45,6 +45,7 @@ module.exports = grunt => {
grunt.log.write(result);
if (error) {
grunt.log.error(result.stdout);
process.exit(code);
}
done();
@@ -56,7 +57,7 @@ module.exports = grunt => {
* @param {array} args
* @returns {object}
*/
const spawnNodeCall = args => grunt.util.spawn({
const spawnNodeCall = (args) => grunt.util.spawn({
cmd: 'node',
args,
}, getSpawnHandler(grunt.task.current.async()));
@@ -91,13 +92,14 @@ module.exports = grunt => {
* @returns {Object} Reference to the spawned task
*/
const cssBuild = () => spawnNodeCall([
'node_modules/node-sass/bin/node-sass',
'--output-style', 'expanded',
'--source-map', true,
'--source-map-contents', true,
'node_modules/sass/sass.js',
'--style', 'expanded',
'--source-map',
'--embed-sources',
'--precision', 6,
'--load-path', process.cwd(),
getCLPath('hugo/scss/docs.scss'),
'-o', getCLPath('hugo/dist/css/'),
getCLPath('hugo/dist/css/docs.css'),
]);
// Register the various component library tasks.
+2 -2
View File
@@ -39,7 +39,7 @@ module.exports = grunt => {
{
rule: {
_attrs: {
ref: './.phpcs.xml.dist',
ref: './phpcs.xml.dist',
},
},
},
@@ -52,7 +52,7 @@ module.exports = grunt => {
});
});
grunt.file.write('.phpcs.xml', toXML(config, {
grunt.file.write('phpcs.xml', toXML(config, {
header: true,
indent: ' ',
}) + "\n");
+2 -3
View File
@@ -30,10 +30,9 @@
* @param {String} srcPath the matched src path
* @return {String} The rewritten destination path.
*/
const babelRename = function(destPath, srcPath) {
destPath = srcPath.replace('src', 'build');
destPath = destPath.replace('.js', '.min.js');
destPath = srcPath.replace(`amd/src`, `amd/build`);
destPath = destPath.replace(/\.js$/, '.min.js');
return destPath;
};
+1 -1
View File
@@ -32,7 +32,7 @@ module.exports = grunt => {
}
},
options: {
implementation: require('node-sass'),
implementation: require('sass'),
includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
}
},
+42
View File
@@ -0,0 +1,42 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2023 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
module.exports = grunt => {
/**
* Generate upgradable third-party libraries (utilising thirdpartylibs.xml data)
*/
grunt.registerTask('upgradablelibs', 'Generate upgradable third-party libraries', async function() {
const done = this.async();
const path = require('path');
const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
// An array of third party libraries that have a newer version in their repositories.
const thirdPartyLibs = await ComponentList.getThirdPartyLibsUpgradable({progress: true});
for (let library of thirdPartyLibs) {
grunt.log.ok(JSON.stringify(Object.assign({}, library), null, 4));
}
done();
});
};
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="MoodleCore">
<rule ref="moodle"/>
</ruleset>
-276
View File
@@ -1,276 +0,0 @@
# PLEASE NOTE: Travis is not currently utilised by the Moodle core integration
# process (which uses our internal CI system) this file is here for the benefit
# of community developers git clones - see MDL-51458.
notifications:
email:
if: env(MOODLE_EMAIL) != no
language: php
os: linux
dist: focal
services:
- mysql
- docker
addons:
postgresql: "12"
apt:
packages:
- postgresql-12
- postgresql-client-12
branches:
except:
- master
- /MOODLE_[0-9]+_STABLE/
- /^v[0-9]+\.[0-9]+\.[0-9]+.*/
jobs:
# 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:
# First all the lowest php ones (7.4)
- php: 7.4
env: DB=none TASK=CITEST
- php: 7.4
env: DB=none TASK=GRUNT
- if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
php: 7.4
env: DB=pgsql TASK=PHPUNIT
- if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
php: 7.4
env: DB=mysqli TASK=PHPUNIT
# Then, conditionally, all the highest php ones (8.0)
- if: env(MOODLE_PHP) = "all"
php: 8.0
env: DB=none TASK=CITEST
- if: env(MOODLE_PHP) = "all"
php: 8.0
env: DB=none TASK=GRUNT
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
php: 8.0
env: DB=pgsql TASK=PHPUNIT
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
php: 8.0
env: DB=mysqli TASK=PHPUNIT
cache:
directories:
- $HOME/.composer/cache
- $HOME/.npm
before_install:
- docker run -d -p 127.0.0.1:8080:80 --name exttests moodlehq/moodle-exttests
# Avoid IPv6 default binding as service (causes redis not to start).
- sudo service redis-server start --bind 127.0.0.1
env:
global:
- PGVER=12
- PGPORT=5433
install:
- >
if [ "$DB" = 'mysqli' ];
then
sudo mkdir /mnt/ramdisk
sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
sudo service mysql stop
sudo mv /var/lib/mysql /mnt/ramdisk
sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
sudo service mysql restart
fi
- >
if [ "$DB" = 'pgsql' ];
then
sudo mkdir /mnt/ramdisk
sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
sudo service postgresql stop
sudo mv /var/lib/postgresql /mnt/ramdisk
sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
sudo service postgresql start
fi
- >
if [ "$TASK" = 'PHPUNIT' ];
then
if [ -n "$GITHUB_APITOKEN" ]; then
composer config github-oauth.github.com $GITHUB_APITOKEN;
echo 'auth.json' >> .git/info/exclude
fi
echo 'extension="redis.so"' > /tmp/redis.ini
phpenv config-add /tmp/redis.ini
# 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 use
fi
before_script:
- if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
- echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- phpenv config-rm xdebug.ini
- >
if [ "$TASK" = 'PHPUNIT' ];
then
# Copy generic configuration in place.
cp config-dist.php config.php ;
# Create the moodledata directory.
mkdir -p "$HOME"/roots/base
# The database name and password.
sed -i \
-e "s%= 'moodle'%= 'travis_ci_test'%" \
-e "s%= 'password'%= ''%" \
config.php ;
# The wwwroot and dataroot.
sed -i \
-e "s%http://example.com/moodle%https://localhost%" \
-e "s%/home/example/moodledata%/home/travis/roots/base%" \
config.php ;
if [ "$DB" = 'pgsql' ];
then
# Postgres-specific setup.
sed -i \
-e "s%= 'username'%= 'travis'%" \
-e "s%'dbsocket' => false%'dbsocket' => true%" \
config.php ;
psql -c 'CREATE DATABASE travis_ci_test;' -U travis;
fi
if [ "$DB" = 'mysqli' ];
then
# MySQL-specific setup.
sed -i \
-e "s%= 'pgsql'%= 'mysqli'%" \
-e "s%= 'username'%= 'travis'%" \
-e "s%=> 'utf8mb4_unicode_ci'%=> 'utf8mb4_bin'%" \
config.php;
mysql -u root -e 'SET GLOBAL innodb_file_format=barracuda;' ;
mysql -u root -e 'SET GLOBAL innodb_file_per_table=ON;' ;
mysql -u root -e 'SET GLOBAL innodb_large_prefix=ON;' ;
mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_bin;' ;
fi
fi
- >
if [ "$TASK" = 'PHPUNIT' ];
then
# Create a directory for the phpunit dataroot.
mkdir -p "$HOME"/roots/phpunit
# The phpunit dataroot and prefix..
sed -i \
-e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
-e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
config.php ;
# Enable test external resources
sed -i \
-e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://127.0.0.1:8080');" \
-e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://127.0.0.1:8080');" \
config.php ;
# Redis cache store tests
sed -i \
-e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
config.php ;
# Redis session tests
sed -i \
-e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
config.php ;
# Initialise PHPUnit for Moodle.
php admin/tool/phpunit/cli/init.php
fi
- >
if [ "$TASK" = 'GRUNT' ];
then
npm install --no-spin;
npm install --no-spin -g grunt ;
fi
########################################################################
# CI Tests
########################################################################
- >
if [ "$TASK" = 'CITEST' ];
then
# Note - this is deliberately placed in the script section as we
# should not add any code until after phpunit has run.
# The following repositories are required.
# The local_ci repository does the actual checking.
git clone https://github.com/moodlehq/moodle-local_ci.git local/ci
# We need the official upstream for comparison
git remote add upstream https://github.com/moodle/moodle.git;
git fetch upstream MOODLE_401_STABLE;
export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
export GIT_COMMIT="$TRAVIS_COMMIT";
export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
# Variables required by our linter.
export gitcmd=`which git`;
export gitdir="$TRAVIS_BUILD_DIR";
export phpcmd=`which php`;
fi
script:
- >
if [ "$TASK" = 'PHPUNIT' ];
then
vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
fi
- >
if [ "$TASK" = 'CITEST' ];
then
bash local/ci/php_lint/php_lint.sh;
fi
- >
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.
# We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
git add . ;
git reset -- npm-shrinkwrap.json ;
git diff --cached --exit-code ;
fi
after_script:
- >
if [ "$TASK" = 'PHPUNIT' ];
then
EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
fi
+2
View File
@@ -260,6 +260,8 @@ module.exports = function(grunt) {
addTask('watch', grunt);
addTask('startup', grunt);
addTask('upgradablelibs', grunt);
// Register the default task.
grunt.registerTask('default', ['startup']);
};
+53 -35
View File
@@ -1,48 +1,66 @@
MOODLE TRADEMARKS POLICY
========================
The word "Moodle" is trademarked in many countries around the world. The word
was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
Environment. The trademark is owned by Martin Dougiamas, Founder and Director
of Moodle.
The Moodle Trademark
--------------------
The law obligates trademark owners to police their marks and prevent the use of
confusingly similar names by third parties. Through this policy wed like to
make it clear how Moodle-related projects, organisations, and people can use
the Moodle trademark. Wed also like to be clear about how use of the word is
restricted when used to promote commercial Moodle services. We do this to
protect the very business model that allows us to continue developing Moodle
for you.
The brand and word "Moodle" has trade mark protection in many countries around
the world. Various Moodle™ trade marks are owned by either Moodle Pty Ltd or
one of its associated entities. The law obligates trade mark owners to police
their trade marks and prevent the use of confusingly similar names by
third parties.
Allowed uses
------------
We have created a more concise and thorough set of Trademark Guidelines
(https://moodle.com/wp-content/uploads/2023/02/Moodle-Trademark-Guidelines-2023-4.pdf)
to help you understand how to comply with Moodle's trade mark requirements.
The Trademark Guidelines will also assist our Moodle Certified Partners and the
community to understand some of the principles that inform Moodle's stance
whenever potential infringement has been detected by us or our community.
The following uses dont require any permission at all:
We need to be clear about use of the word "Moodle" and how we restrict its use
when promoting commercial Moodle™ branded services. The proper use of
trade marks reliably assures consumers about the quality of the associated
products or services and where they have been derived from. Because the
Moodle LMS is made available under the open source GNU General Public License'
that permits you to modify the copyrighted software, the distribution of such
modified software in combination with Moodle trade marks can potentially
mislead others in the community. To be clear, the GNU GPL does not include an
implied right or licence to use Moodle's trade marks.
* Referring to the software or the Moodle project.
* Describing your own Moodle implementation (including within corporate
settings).
We do all this to protect the very business model that allows us to continue
developing various Moodle software solutions for you.
Allowed uses of "Moodle"
------------------------
The following uses don't require any permission at all:
* Referring to the software or the Moodle project as the "Moodle™ software"
or the "Moodle™ project"
* Describing your own implementation of the Moodle™ software platform
(including within corporate settings).
* Describing a Moodle-based community hub.
* Describing some software youve made that integrates with Moodle
(eg a Moodle integration feature on another system).
* Describing certain software you've made that integrates with Moodle
branded software (e.g. a Moodle integration feature on another system).
Restricted uses
---------------
Restricted uses of "Moodle"
---------------------------
The following uses are generally prohibited without explicit and direct
permission being granted to you by Moodle Pty Ltd. We do this to protect the
Moodle project from software and sites which could confuse people. Please
contact us to ask for permission in writing.
Moodle project from software and sites which could confuse people. If in
doubt, reach out for clarification at <trademarks@moodle.com>
* You cant use "Moodle" in the name of your software (including Mobile apps)
* You cant use "Moodle" in your company name
* You cant use "Moodle" in your domain name
* You cant use "Moodle" in advertising-related keywords (such as Adsense)
* You cant use "Moodle" to describe services around Moodle (such as hosting,
training, support, consulting, course creation services, theme development,
customisation, installation, integration and certification). This applies
even if you do not charge for the services. Note that usually only Moodle
Partners have this permission.
For information about the Moodle Partner Certification Mark as well as for how
to contact us, please see <https://moodle.com/trademarks/>.
* You can't use the word "Moodle" or any Moodle logos for commercial purposes
without prior written permission from Moodle HQ.
* You can't use "Moodle" in the name of your software (including Mobile apps).
* You can't use "Moodle" in your company name.
* You can't use "Moodle" in your domain name.
* You can't use "Moodle" in advertising-related keywords (such as Adsense).
* You can't use "Moodle" to describe services around Moodle
(such as hosting, training, support, consulting, course creation services,
theme development, customisation, installation, integration, analytics
and certification) that cause consumers to be confused that you are
associated with Moodle HQ if you are not.
This applies even if you do not charge for the services.
Note that usually only Moodle Partners have this permission.
+3
View File
@@ -0,0 +1,3 @@
define("core_admin/block_management_table",["exports","./plugin_management_table","core_table/dynamic","core/ajax","core/pending","core/notification"],(function(_exports,_plugin_management_table,_dynamic,_ajax,_pending,_notification){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_plugin_management_table=_interopRequireDefault(_plugin_management_table),_pending=_interopRequireDefault(_pending);class _default extends _plugin_management_table.default{constructor(){super(),this.addClickHandler(this.handleBlockProtectToggle)}setBlockProtectState(plugin,state){return(0,_ajax.call)([{methodname:"core_admin_set_block_protection",args:{plugin:plugin,state:state}}])[0]}async handleBlockProtectToggle(tableRoot,e){const stateToggle=e.target.closest('[data-action="toggleprotectstate"]');if(stateToggle){e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:processAction");await this.setBlockProtectState(stateToggle.dataset.plugin,"1"===stateToggle.dataset.targetState?1:0);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]);updatedRoot.querySelector('[data-action="toggleprotectstate"][data-plugin="'.concat(stateToggle.dataset.plugin,'"]')).focus(),pendingPromise.resolve()}}}return _exports.default=_default,_exports.default}));
//# sourceMappingURL=block_management_table.min.js.map
@@ -0,0 +1 @@
{"version":3,"file":"block_management_table.min.js","sources":["../src/block_management_table.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\nimport PluginManagementTable from './plugin_management_table';\nimport {refreshTableContent} from 'core_table/dynamic';\nimport {call as fetchMany} from 'core/ajax';\nimport Pending from 'core/pending';\nimport {fetchNotifications} from 'core/notification';\n\nexport default class extends PluginManagementTable {\n constructor() {\n super();\n this.addClickHandler(this.handleBlockProtectToggle);\n }\n\n /**\n * Set the block protection state.\n *\n * @param {string} plugin\n * @param {number} state\n * @returns {Promise}\n */\n setBlockProtectState(plugin, state) {\n return fetchMany([{\n methodname: 'core_admin_set_block_protection',\n args: {\n plugin,\n state,\n },\n }])[0];\n }\n\n /**\n * Handle toggling of block protection.\n *\n * @param {HTMLElement} tableRoot\n * @param {Event} e\n */\n async handleBlockProtectToggle(tableRoot, e) {\n const stateToggle = e.target.closest('[data-action=\"toggleprotectstate\"]');\n if (stateToggle) {\n e.preventDefault();\n const pendingPromise = new Pending('core_table/dynamic:processAction');\n\n await this.setBlockProtectState(\n stateToggle.dataset.plugin,\n stateToggle.dataset.targetState === '1' ? 1 : 0\n );\n\n const [updatedRoot] = await Promise.all([\n refreshTableContent(tableRoot),\n fetchNotifications(),\n ]);\n\n // Refocus on the link that as pressed in the first place.\n updatedRoot.querySelector(`[data-action=\"toggleprotectstate\"][data-plugin=\"${stateToggle.dataset.plugin}\"]`).focus();\n pendingPromise.resolve();\n }\n }\n}\n"],"names":["PluginManagementTable","constructor","addClickHandler","this","handleBlockProtectToggle","setBlockProtectState","plugin","state","methodname","args","tableRoot","e","stateToggle","target","closest","preventDefault","pendingPromise","Pending","dataset","targetState","updatedRoot","Promise","all","querySelector","focus","resolve"],"mappings":"uhBAqB6BA,iCACzBC,2BAESC,gBAAgBC,KAAKC,0BAU9BC,qBAAqBC,OAAQC,cAClB,cAAU,CAAC,CACdC,WAAY,kCACZC,KAAM,CACFH,OAAAA,OACAC,MAAAA,UAEJ,kCASuBG,UAAWC,SAChCC,YAAcD,EAAEE,OAAOC,QAAQ,yCACjCF,YAAa,CACbD,EAAEI,uBACIC,eAAiB,IAAIC,iBAAQ,0CAE7Bd,KAAKE,qBACPO,YAAYM,QAAQZ,OACgB,MAApCM,YAAYM,QAAQC,YAAsB,EAAI,SAG3CC,mBAAqBC,QAAQC,IAAI,EACpC,gCAAoBZ,YACpB,wCAIJU,YAAYG,wEAAiEX,YAAYM,QAAQZ,cAAYkB,QAC7GR,eAAeS"}
+3
View File
@@ -0,0 +1,3 @@
define("core_admin/plugin_management_table",["exports","core_table/dynamic","core_table/local/dynamic/selectors","core/ajax","core/pending","core/notification"],(function(_exports,_dynamic,Selectors,_ajax,_pending,_notification){var obj;function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,Selectors=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Selectors),_pending=(obj=_pending)&&obj.__esModule?obj:{default:obj};let watching=!1;return _exports.default=class{constructor(){!function(obj,key,value){key in obj?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value}(this,"clickHandlers",[]),this.addClickHandler(this.handleStateToggle),this.addClickHandler(this.handleMoveUpDown),this.registerEventListeners()}static init(){watching||(watching=!0,new this)}addClickHandler(handler){this.clickHandlers.push(handler.bind(this))}registerEventListeners(){document.addEventListener("click",function(e){const tableRoot=this.getTableRoot(e);tableRoot&&this.clickHandlers.forEach((handler=>handler(tableRoot,e)))}.bind(this))}getTableRoot(e){const tableRoot=e.target.closest(Selectors.main.region);return tableRoot||!1}setPluginState(methodname,plugin,state){return(0,_ajax.call)([{methodname:methodname,args:{plugin:plugin,state:state}}])[0]}setPluginOrder(methodname,plugin,direction){return(0,_ajax.call)([{methodname:methodname,args:{plugin:plugin,direction:direction}}])[0]}async handleStateToggle(tableRoot,e){const stateToggle=e.target.closest('[data-action="togglestate"][data-toggle-method]');if(stateToggle){e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:togglestate");await this.setPluginState(stateToggle.dataset.toggleMethod,stateToggle.dataset.plugin,"1"===stateToggle.dataset.state?0:1);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]);updatedRoot.querySelector('[data-action="togglestate"][data-plugin="'.concat(stateToggle.dataset.plugin,'"]')).focus(),pendingPromise.resolve()}}async handleMoveUpDown(tableRoot,e){const actionLink=e.target.closest('[data-action="move"][data-method][data-direction]');if(!actionLink)return;e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:processAction");await this.setPluginOrder(actionLink.dataset.method,actionLink.dataset.plugin,"up"===actionLink.dataset.direction?-1:1);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]),exactMatch=updatedRoot.querySelector('[data-action="move"][data-plugin="'.concat(actionLink.dataset.plugin,'"][data-direction="').concat(actionLink.dataset.direction,'"]'));var _updatedRoot$querySel;exactMatch?exactMatch.focus():null===(_updatedRoot$querySel=updatedRoot.querySelector('[data-action="move"][data-plugin="'.concat(actionLink.dataset.plugin,'"]')))||void 0===_updatedRoot$querySel||_updatedRoot$querySel.focus();pendingPromise.resolve()}},_exports.default}));
//# sourceMappingURL=plugin_management_table.min.js.map
File diff suppressed because one or more lines are too long
+72
View File
@@ -0,0 +1,72 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import PluginManagementTable from './plugin_management_table';
import {refreshTableContent} from 'core_table/dynamic';
import {call as fetchMany} from 'core/ajax';
import Pending from 'core/pending';
import {fetchNotifications} from 'core/notification';
export default class extends PluginManagementTable {
constructor() {
super();
this.addClickHandler(this.handleBlockProtectToggle);
}
/**
* Set the block protection state.
*
* @param {string} plugin
* @param {number} state
* @returns {Promise}
*/
setBlockProtectState(plugin, state) {
return fetchMany([{
methodname: 'core_admin_set_block_protection',
args: {
plugin,
state,
},
}])[0];
}
/**
* Handle toggling of block protection.
*
* @param {HTMLElement} tableRoot
* @param {Event} e
*/
async handleBlockProtectToggle(tableRoot, e) {
const stateToggle = e.target.closest('[data-action="toggleprotectstate"]');
if (stateToggle) {
e.preventDefault();
const pendingPromise = new Pending('core_table/dynamic:processAction');
await this.setBlockProtectState(
stateToggle.dataset.plugin,
stateToggle.dataset.targetState === '1' ? 1 : 0
);
const [updatedRoot] = await Promise.all([
refreshTableContent(tableRoot),
fetchNotifications(),
]);
// Refocus on the link that as pressed in the first place.
updatedRoot.querySelector(`[data-action="toggleprotectstate"][data-plugin="${stateToggle.dataset.plugin}"]`).focus();
pendingPromise.resolve();
}
}
}
+179
View File
@@ -0,0 +1,179 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import {refreshTableContent} from 'core_table/dynamic';
import * as Selectors from 'core_table/local/dynamic/selectors';
import {call as fetchMany} from 'core/ajax';
import Pending from 'core/pending';
import {fetchNotifications} from 'core/notification';
let watching = false;
export default class {
/**
* @property {function[]} clickHandlers a list of handlers to call on click.
*/
clickHandlers = [];
constructor() {
this.addClickHandler(this.handleStateToggle);
this.addClickHandler(this.handleMoveUpDown);
this.registerEventListeners();
}
/**
* Initialise an instance of the class.
*
* This is just a way of making it easier to initialise an instance of the class from PHP.
*/
static init() {
if (watching) {
return;
}
watching = true;
new this();
}
/**
* Add a click handler to the list of handlers.
*
* @param {Function} handler A handler to call on a click event
*/
addClickHandler(handler) {
this.clickHandlers.push(handler.bind(this));
}
/**
* Register the event listeners for this instance.
*/
registerEventListeners() {
document.addEventListener('click', function(e) {
const tableRoot = this.getTableRoot(e);
if (!tableRoot) {
return;
}
this.clickHandlers.forEach((handler) => handler(tableRoot, e));
}.bind(this));
}
/**
* Get the table root from an event.
*
* @param {Event} e
* @returns {HTMLElement|bool}
*/
getTableRoot(e) {
const tableRoot = e.target.closest(Selectors.main.region);
if (!tableRoot) {
return false;
}
return tableRoot;
}
/**
* Set the plugin state (enabled or disabled)
*
* @param {string} methodname The web service to call
* @param {string} plugin The name of the plugin to set the state for
* @param {number} state The state to set
* @returns {Promise}
*/
setPluginState(methodname, plugin, state) {
return fetchMany([{
methodname,
args: {
plugin,
state,
},
}])[0];
}
setPluginOrder(methodname, plugin, direction) {
return fetchMany([{
methodname,
args: {
plugin,
direction,
},
}])[0];
}
/**
* Handle state toggling.
*
* @param {HTMLElement} tableRoot
* @param {Event} e
*/
async handleStateToggle(tableRoot, e) {
const stateToggle = e.target.closest('[data-action="togglestate"][data-toggle-method]');
if (stateToggle) {
e.preventDefault();
const pendingPromise = new Pending('core_table/dynamic:togglestate');
await this.setPluginState(
stateToggle.dataset.toggleMethod,
stateToggle.dataset.plugin,
stateToggle.dataset.state === '1' ? 0 : 1
);
const [updatedRoot] = await Promise.all([
refreshTableContent(tableRoot),
fetchNotifications(),
]);
// Refocus on the link that as pressed in the first place.
updatedRoot.querySelector(`[data-action="togglestate"][data-plugin="${stateToggle.dataset.plugin}"]`).focus();
pendingPromise.resolve();
}
}
async handleMoveUpDown(tableRoot, e) {
const actionLink = e.target.closest('[data-action="move"][data-method][data-direction]');
if (!actionLink) {
return;
}
e.preventDefault();
const pendingPromise = new Pending('core_table/dynamic:processAction');
await this.setPluginOrder(
actionLink.dataset.method,
actionLink.dataset.plugin,
actionLink.dataset.direction === 'up' ? -1 : 1,
);
const [updatedRoot] = await Promise.all([
refreshTableContent(tableRoot),
fetchNotifications(),
]);
// Refocus on the link that as pressed in the first place.
const exactMatch = updatedRoot.querySelector(
`[data-action="move"][data-plugin="${actionLink.dataset.plugin}"][data-direction="${actionLink.dataset.direction}"]`
);
if (exactMatch) {
exactMatch.focus();
} else {
// The move link is not present anymore, so we need to focus on the other one.
updatedRoot.querySelector(`[data-action="move"][data-plugin="${actionLink.dataset.plugin}"]`)?.focus();
}
pendingPromise.resolve();
}
}
-210
View File
@@ -1,210 +0,0 @@
<?php
/**
* Edit configuration for an individual auth plugin
*/
require_once '../config.php';
require_once $CFG->libdir.'/adminlib.php';
$auth = required_param('auth', PARAM_PLUGIN);
$PAGE->set_pagetype('admin-auth-' . $auth);
admin_externalpage_setup('authsetting'.$auth);
$authplugin = get_auth_plugin($auth);
$err = array();
$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
debugging("Use of config.html files in authentication plugins have been deprecated. " .
" Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
// save configuration changes
if ($frm = data_submitted() and confirm_sesskey()) {
$authplugin->validate_form($frm, $err);
if (count($err) == 0) {
// save plugin config
if ($authplugin->process_config($frm)) {
// save field lock configuration
foreach ($frm as $name => $value) {
if (preg_match('/^lockconfig_(.+?)$/', $name, $matches)) {
$plugin = "auth/$auth";
$name = $matches[1];
set_config($name, $value, $plugin);
}
}
redirect($returnurl);
exit;
}
} else {
foreach ($err as $key => $value) {
$focus = "form.$key";
}
}
} else {
$frmlegacystyle = get_config('auth/'.$auth);
$frmnewstyle = get_config('auth_'.$auth);
$frm = (object)array_merge((array)$frmlegacystyle, (array)$frmnewstyle);
}
$user_fields = $authplugin->userfields;
//$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");
/// Get the auth title (from core or own auth lang files)
$authtitle = $authplugin->get_title();
/// Get the auth descriptions (from core or own auth lang files)
$authdescription = $authplugin->get_description();
// output configuration form
echo $OUTPUT->header();
// choose an authentication method
echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
echo "<div>\n";
echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
// auth plugin description
echo $OUTPUT->box_start();
echo $OUTPUT->heading($authtitle);
echo $OUTPUT->box_start('informationbox');
echo $authdescription;
echo $OUTPUT->box_end();
echo "<hr />\n";
$authplugin->config_form($frm, $err, $user_fields);
echo $OUTPUT->box_end();
echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
echo "</div>\n";
echo "</form>\n";
$PAGE->requires->string_for_js('unmaskpassword', 'core_form');
$PAGE->requires->yui_module('moodle-auth-passwordunmask', 'M.auth.passwordunmask');
echo $OUTPUT->footer();
exit;
/// Functions /////////////////////////////////////////////////////////////////
/**
* auth field locking
* Good enough for most auth plugins
* but some may want a custom one if they are offering
* other options
* Note: lockconfig_ fields have special handling.
*
* @param string $auth authentication plugin shortname
* @param array $user_fields user profile fields
* @param string $helptext help text to be displayed at top of form
* @param boolean $retrieveopts Map fields or lock only.
* @param boolean $updateopts Allow remote updates
* @param array $customfields list of custom profile fields
* @deprecated since Moodle 3.3
*/
function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
global $DB, $OUTPUT;
debugging("The function 'print_auth_lock_options' has been deprecated, " .
"Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
DEBUG_DEVELOPER);
echo '<tr><td colspan="3">';
if ($retrieveopts) {
echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
} else {
echo $OUTPUT->heading(get_string('auth_fieldlocks', 'auth'));
}
echo '</td></tr>';
$lockoptions = array ('unlocked' => get_string('unlocked', 'auth'),
'unlockedifempty' => get_string('unlockedifempty', 'auth'),
'locked' => get_string('locked', 'auth'));
$updatelocaloptions = array('oncreate' => get_string('update_oncreate', 'auth'),
'onlogin' => get_string('update_onlogin', 'auth'));
$updateextoptions = array('0' => get_string('update_never', 'auth'),
'1' => get_string('update_onupdate', 'auth'));
$pluginconfig = get_config("auth/$auth");
// Helptext is on a field with rowspan.
if (empty($helptext)) {
$helptext = '&nbsp;';
}
// If we have custom fields then merge them with user fields.
if (!empty($customfields)) {
$user_fields = array_merge($user_fields, $customfields);
}
if (!empty($customfields)) {
$customfieldname = $DB->get_records('user_info_field', null, '', 'shortname, name');
}
foreach ($user_fields as $field) {
// Define some vars we'll work with.
if (!isset($pluginconfig->{"field_map_$field"})) {
$pluginconfig->{"field_map_$field"} = '';
}
if (!isset($pluginconfig->{"field_updatelocal_$field"})) {
$pluginconfig->{"field_updatelocal_$field"} = '';
}
if (!isset($pluginconfig->{"field_updateremote_$field"})) {
$pluginconfig->{"field_updateremote_$field"} = '';
}
if (!isset($pluginconfig->{"field_lock_$field"})) {
$pluginconfig->{"field_lock_$field"} = '';
}
// Define the fieldname we display to the user.
$fieldname = $field;
if ($fieldname === 'lang') {
$fieldname = get_string('language');
} elseif (!empty($customfields) && in_array($field, $customfields)) {
// If custom field then pick name from database.
$fieldshortname = str_replace('profile_field_', '', $fieldname);
$fieldname = $customfieldname[$fieldshortname]->name;
if (core_text::strlen($fieldshortname) > 67) {
// If custom profile field name is longer than 67 characters we will not be able to store the setting
// such as 'field_updateremote_profile_field_NOTSOSHORTSHORTNAME' in the database because the character
// limit for the setting name is 100.
continue;
}
} else {
$fieldname = get_string($fieldname);
}
if ($retrieveopts) {
$varname = 'field_map_' . $field;
echo '<tr valign="top"><td align="right">';
echo '<label for="lockconfig_'.$varname.'">'.$fieldname.'</label>';
echo '</td><td>';
echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
echo '<div style="text-align: right">';
echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
echo html_writer::select($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, false);
echo '<br />';
if ($updateopts) {
echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
echo html_writer::select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false);
echo '<br />';
}
echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
echo '</div>';
} else {
echo '<tr valign="top"><td align="right">';
echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
echo '</td><td>';
echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
}
echo '</td>';
if (!empty($helptext)) {
echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
$helptext = '';
}
echo '</tr>';
}
}
+79 -224
View File
@@ -1,239 +1,94 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
// Allows the admin to configure blocks (hide/show, uninstall and configure)
/**
* Allows the admin to configure blocks (hide/show, uninstall and configure)
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once('../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/blocklib.php');
require_once($CFG->libdir.'/tablelib.php');
require_once('../config.php');
require_once("{$CFG->libdir}/adminlib.php");
require_once("{$CFG->libdir}/blocklib.php");
require_once("{$CFG->libdir}/tablelib.php");
admin_externalpage_setup('manageblocks');
admin_externalpage_setup('manageblocks');
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$hide = optional_param('hide', 0, PARAM_INT);
$show = optional_param('show', 0, PARAM_INT);
$unprotect = optional_param('unprotect', 0, PARAM_INT);
$protect = optional_param('protect', 0, PARAM_INT);
$plugin = optional_param('plugin', '', PARAM_PLUGIN);
$action = optional_param('action', '', PARAM_ALPHA);
$unprotect = optional_param('unprotect', 0, PARAM_PLUGIN);
$protect = optional_param('protect', 0, PARAM_PLUGIN);
/// Print headings
$strmanageblocks = get_string('manageblocks');
$strmanageblocks = get_string('manageblocks');
$struninstall = get_string('uninstallplugin', 'core_admin');
$strversion = get_string('version');
$strhide = get_string('hide');
$strshow = get_string('show');
$strsettings = get_string('settings');
$strcourses = get_string('blockinstances', 'admin');
$strname = get_string('name');
$strshowblockcourse = get_string('showblockcourse');
$strprotecthdr = get_string('blockprotect', 'admin'). $OUTPUT->help_icon('blockprotect','admin');
$strprotect = get_string('blockprotect', 'admin');
$strunprotect = get_string('blockunprotect', 'admin');
// If data submitted, then process and store.
if (!empty($plugin) && !empty($action) && confirm_sesskey()) {
$manager = \core_plugin_manager::resolve_plugininfo_class('block');
$pluginname = get_string('pluginname', "block_{$plugin}");
// If data submitted, then process and store.
if (!empty($hide) && confirm_sesskey()) {
if (!$block = $DB->get_record('block', ['id' => $hide])) {
throw new \moodle_exception('blockdoesnotexist', 'error');
}
$class = \core_plugin_manager::resolve_plugininfo_class('block');
$class::enable_plugin($block->name, false);
// Settings not required - only pages.
admin_get_root(true, false);
}
if (!empty($show) && confirm_sesskey() ) {
if (!$block = $DB->get_record('block', ['id' => $show])) {
throw new \moodle_exception('blockdoesnotexist', 'error');
}
$class = \core_plugin_manager::resolve_plugininfo_class('block');
$class::enable_plugin($block->name, true);
// Settings not required - only pages.
admin_get_root(true, false);
}
if (!empty($protect) && confirm_sesskey()) {
block_manager::protect_block((int)$protect);
admin_get_root(true, false); // settings not required - only pages
}
if (!empty($unprotect) && confirm_sesskey()) {
block_manager::unprotect_block((int)$unprotect);
admin_get_root(true, false); // settings not required - only pages
}
$undeletableblocktypes = block_manager::get_undeletable_block_types();
echo $OUTPUT->header();
echo $OUTPUT->heading($strmanageblocks);
echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
/// Main display starts here
/// Get and sort the existing blocks
if (!$blocks = $DB->get_records('block', array(), 'name ASC')) {
throw new \moodle_exception('noblocks', 'error'); // Should never happen.
}
$incompatible = array();
/// Print the table of all blocks
$table = new flexible_table('admin-blocks-compatible');
$table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'settings', 'uninstall'));
$table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strsettings, $struninstall));
$table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
$table->set_attribute('class', 'admintable blockstable generaltable');
$table->set_attribute('id', 'compatibleblockstable');
$table->setup();
$tablerows = array();
// Sort blocks using current locale.
$blocknames = array();
foreach ($blocks as $blockid=>$block) {
$blockname = $block->name;
if (file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
$blocknames[$blockid] = get_string('pluginname', 'block_'.$blockname);
} else {
$blocknames[$blockid] = $blockname;
}
}
core_collator::asort($blocknames);
foreach ($blocknames as $blockid=>$strblockname) {
$block = $blocks[$blockid];
$blockname = $block->name;
$dbversion = get_config('block_'.$block->name, 'version');
if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
$blockobject = false;
$strblockname = '<span class="notifyproblem">'.$strblockname.' ('.get_string('missingfromdisk').')</span>';
$plugin = new stdClass();
$plugin->version = $dbversion;
} else {
$plugin = new stdClass();
$plugin->version = '???';
if (file_exists("$CFG->dirroot/blocks/$blockname/version.php")) {
include("$CFG->dirroot/blocks/$blockname/version.php");
}
if (!$blockobject = block_instance($block->name)) {
$incompatible[] = $block;
continue;
}
}
if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$blockname, 'manage')) {
$uninstall = html_writer::link($uninstallurl, $struninstall);
} else {
$uninstall = '';
}
$settings = ''; // By default, no configuration
if ($blockobject and $blockobject->has_config()) {
$blocksettings = admin_get_root()->locate('blocksetting' . $block->name);
if ($blocksettings instanceof admin_externalpage) {
$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 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);
}
}
// MDL-11167, blocks can be placed on mymoodle, or the blogs page
// and it should not show up on course search page
$totalcount = $DB->count_records('block_instances', array('blockname'=>$blockname));
$count = $DB->count_records('block_instances', array('blockname'=>$blockname, 'pagetypepattern'=>'course-view-*'));
if ($count>0) {
$blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey=".sesskey()."\" ";
$blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
}
else {
$blocklist = "$totalcount";
}
$class = ''; // Nothing fancy, by default
if (!$blockobject) {
// ignore
$visible = '';
} else if ($blocks[$blockid]->visible) {
$visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
$OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
} else {
$visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
$OUTPUT->pix_icon('t/show', $strshow) . '</a>';
$class = 'dimmed_text';
}
if ($dbversion == $plugin->version) {
$version = $dbversion;
} else {
$version = "$dbversion ($plugin->version)";
}
if (!$blockobject) {
// ignore
$undeletable = '';
} else if (in_array($blockname, $undeletableblocktypes)) {
$undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
$OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
} else {
$undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
$OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
}
$row = array(
$strblockname,
$blocklist,
$version,
$visible,
$undeletable,
$settings,
$uninstall,
if ($action === 'disable' && $manager::enable_plugin($plugin, 0)) {
\core\notification::add(
get_string('plugin_disabled', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
$table->add_data($row, $class);
// Settings not required - only pages.
admin_get_root(true, false);
} else if ($action === 'enable' && $manager::enable_plugin($plugin, 1)) {
\core\notification::add(
get_string('plugin_enabled', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
// Settings not required - only pages.
admin_get_root(true, false);
}
$table->print_html();
// Redirect back to the page with out any params.
redirect(new moodle_url('/admin/blocks.php'));
}
if (!empty($incompatible)) {
echo $OUTPUT->heading(get_string('incompatibleblocks', 'blockstable', 'admin'));
if (!empty($protect) && confirm_sesskey()) {
block_manager::protect_block($protect);
$pluginname = get_string('pluginname', "block_{$protect}");
\core\notification::add(
get_string('blockprotected', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
// Settings not required - only pages.
admin_get_root(true, false);
}
$table = new flexible_table('admin-blocks-incompatible');
if (!empty($unprotect) && confirm_sesskey()) {
block_manager::unprotect_block($unprotect);
$pluginname = get_string('pluginname', "block_{$unprotect}");
\core\notification::add(
get_string('blockunprotected', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
// Settings not required - only pages.
admin_get_root(true, false);
}
$table->define_columns(array('block', 'uninstall'));
$table->define_headers(array($strname, $struninstall));
$table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
echo $OUTPUT->header();
echo $OUTPUT->heading($strmanageblocks);
echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info', false);
$table->set_attribute('class', 'incompatibleblockstable generaltable');
$table->setup();
foreach ($incompatible as $block) {
if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$block->name, 'manage')) {
$uninstall = html_writer::link($uninstallurl, $struninstall);
} else {
$uninstall = '';
}
$table->add_data(array(
$block->name,
$uninstall,
));
}
$table->print_html();
}
echo $OUTPUT->footer();
// Print the table of all blocks.
$table = new \core_admin\table\block_management_table();
$table->out();
echo $OUTPUT->footer();
@@ -0,0 +1,127 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\admin;
use admin_setting;
use core_plugin_manager;
use core_text;
/**
* Admin setting plugin manager.
*
* @package core_admin
* @subpackage admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class admin_setting_plugin_manager extends admin_setting {
/** @var core_plugin_manager The plugin manager instance */
protected core_plugin_manager $pluginmanager;
/** @var string The plugintype that this manager covers */
protected string $plugintype;
/** @var string The class of the management table to use */
protected string $tableclass;
public function __construct(
string $plugintype,
string $tableclass,
string $name,
string $visiblename,
string $description = '',
string $defaultsetting = '',
) {
$this->nosave = true;
$this->pluginmanager = core_plugin_manager::instance();
$this->plugintype = $plugintype;
$this->tableclass = $tableclass;
parent::__construct($name, $visiblename, $description, $defaultsetting);
}
/**
* Always returns true, does nothing
*
* @return true
*/
public function get_setting(): bool {
return true;
}
/**
* Always returns true, does nothing
*
* @return true
*/
public function get_defaultsetting(): bool {
return true;
}
/**
* Always returns '', does not write anything
*
* @return string Always returns ''
*/
// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
public function write_setting($data): string {
// Do not write any setting.
return '';
}
/**
* Checks if $query is one of the available editors
*
* @param string $query The string to search for
* @return bool Returns true if found, false if not
*/
public function is_related($query) {
if (parent::is_related($query)) {
return true;
}
$plugins = $this->pluginmanager->get_installed_plugins($this->plugintype);
foreach (array_keys($plugins) as $plugin) {
$plugin = "{$this->plugintype}_{$plugin}";
if (str_contains($plugin, $query)) {
return true;
}
$pluginname = get_string('pluginname', $plugin);
if (strpos(core_text::strtolower($pluginname), $query) !== false) {
return true;
}
}
return false;
}
/**
* Builds the XHTML to display the control
*
* @param string $data Unused
* @param string $query
* @return string
*/
public function output_html($data, $query = ''): string {
$table = new $this->tableclass();
if (!($table instanceof \core_admin\table\plugin_management_table)) {
throw new \coding_exception("{$this->tableclass} must be an instance of \\core_admin\\table\\plugin_management_table");
}
return highlight($query, $table->get_content());
}
}
+97
View File
@@ -0,0 +1,97 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\external;
use block_manager;
use core_external\external_api;
use core_external\external_function_parameters;
use core_external\external_single_structure;
use core_external\external_value;
/**
* Web Service to control the state of a plugin.
*
* @package core_admin
* @category external
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_block_protection extends external_api {
/**
* Returns description of method parameters
*
* @return external_function_parameters
*/
public static function execute_parameters(): external_function_parameters {
return new external_function_parameters([
'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
'state' => new external_value(PARAM_INT, 'The target state', VALUE_REQUIRED),
]);
}
/**
* Set the block protection state.
*
* @param string $plugin The name of the plugin
* @param int $state The target state
* @return null
*/
public static function execute(
string $plugin,
int $state,
): array {
[
'plugin' => $plugin,
'state' => $state,
] = self::validate_parameters(self::execute_parameters(), [
'plugin' => $plugin,
'state' => $state,
]);
$context = \context_system::instance();
self::validate_context($context);
require_capability('moodle/site:config', $context);
[, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
$displayname = get_string('pluginname', $plugin);
if ($state) {
block_manager::protect_block($pluginname);
\core\notification::add(
get_string('blockprotected', 'core_admin', $displayname),
\core\notification::SUCCESS
);
} else {
block_manager::unprotect_block($pluginname);
\core\notification::add(
get_string('blockunprotected', 'core_admin', $displayname),
\core\notification::SUCCESS
);
}
return [];
}
/**
* Describe the return structure of the external service.
*
* @return external_single_structure
*/
public static function execute_returns(): external_single_structure {
return new external_single_structure([]);
}
}
+84
View File
@@ -0,0 +1,84 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\external;
use core_external\external_api;
use core_external\external_function_parameters;
use core_external\external_single_structure;
use core_external\external_value;
/**
* Web Service to control the order of a plugin.
*
* @package core_admin
* @category external
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_plugin_order extends external_api {
/**
* Returns description of method parameters
*
* @return external_function_parameters
*/
public static function execute_parameters(): external_function_parameters {
return new external_function_parameters([
'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
'direction' => new external_value(PARAM_INT, 'The direction to move', VALUE_REQUIRED),
]);
}
/**
* Set the plugin state.
*
* @param string $plugin The name of the plugin
* @param int $direction The direction to move the plugin
* @return array
*/
public static function execute(
string $plugin,
int $direction,
): array {
[
'plugin' => $plugin,
'direction' => $direction,
] = self::validate_parameters(self::execute_parameters(), [
'plugin' => $plugin,
'direction' => $direction,
]);
$context = \context_system::instance();
self::validate_context($context);
require_capability('moodle/site:config', $context);
[$plugintype, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
$manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
$manager::change_plugin_order($pluginname, $direction);
return [];
}
/**
* Describe the return structure of the external service.
*
* @return external_single_structure
*/
public static function execute_returns(): external_single_structure {
return new external_single_structure([]);
}
}
+98
View File
@@ -0,0 +1,98 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\external;
use core_external\external_api;
use core_external\external_function_parameters;
use core_external\external_single_structure;
use core_external\external_value;
/**
* Web Service to control the state of a plugin.
*
* @package core_admin
* @category external
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_plugin_state extends external_api {
/**
* Returns description of method parameters
*
* @return external_function_parameters
*/
public static function execute_parameters(): external_function_parameters {
return new external_function_parameters([
'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
'state' => new external_value(PARAM_INT, 'The target state', VALUE_REQUIRED),
]);
}
/**
* Set the plugin state.
*
* @param string $plugin The name of the plugin
* @param int $state The target state
* @return null
*/
public static function execute(
string $plugin,
int $state,
): array {
[
'plugin' => $plugin,
'state' => $state,
] = self::validate_parameters(self::execute_parameters(), [
'plugin' => $plugin,
'state' => $state,
]);
$context = \context_system::instance();
self::validate_context($context);
require_capability('moodle/site:config', $context);
[$plugintype, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
$manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
$displayname = get_string('pluginname', $plugin);
if ($manager::enable_plugin($pluginname, $state)) {
if (!empty($state)) {
\core\notification::add(
get_string('plugin_enabled', 'core_admin', $displayname),
\core\notification::SUCCESS
);
} else {
\core\notification::add(
get_string('plugin_disabled', 'core_admin', $displayname),
\core\notification::SUCCESS
);
}
}
return [];
}
/**
* Describe the return structure of the external service.
*
* @return external_single_structure
*/
public static function execute_returns(): external_single_structure {
return new external_single_structure([]);
}
}
@@ -0,0 +1,118 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use core_plugin_manager;
use dml_exception;
use html_writer;
use moodle_url;
use stdClass;
/**
* Activity Module admin settings.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class activity_management_table extends plugin_management_table {
public function setup() {
$this->set_attribute('id', 'modules');
$this->set_attribute('class', 'admintable generaltable');
parent::setup();
}
protected function get_table_id(): string {
return 'module-administration-table';
}
protected function get_plugintype(): string {
return 'mod';
}
public function guess_base_url(): void {
$this->define_baseurl(
new moodle_url('/admin/modules.php')
);
}
protected function get_action_url(array $params = []): moodle_url {
return new moodle_url('/admin/modules.php', $params);
}
protected function get_column_list(): array {
$columns = parent::get_column_list();
return array_merge(
array_slice($columns, 0, 1, true),
['activities' => get_string('activities')],
array_slice($columns, 1, null, true),
);
}
protected function col_name(stdClass $row): string {
global $OUTPUT;
$status = $row->plugininfo->get_status();
if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
return html_writer::span(
get_string('pluginmissingfromdisk', 'core', $row->plugininfo),
'notifyproblem'
);
}
return html_writer::span(
html_writer::img(
$OUTPUT->image_url('monologo', $row->plugininfo->name),
'',
[
'class' => 'icon',
],
) . get_string('modulename', $row->plugininfo->name)
);
}
/**
* Show the number of activities present, with a link to courses containing activity if relevant.
*
* @param mixed $row
* @return string
*/
protected function col_activities(stdClass $row): string {
global $DB, $OUTPUT;
try {
$count = $DB->count_records_select($row->plugininfo->name, "course <> 0");
} catch (dml_exception $e) {
$count = -1;
}
if ($count > 0) {
return $OUTPUT->action_link(
new moodle_url('/course/search.php', [
'modulelist' => $row->plugininfo->name,
]),
$count,
null,
['title' => get_string('showmodulecourse')]
);
} else if ($count < 0) {
return get_string('error');
} else {
return $count;
}
}
}
@@ -0,0 +1,153 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use html_writer;
use moodle_url;
use stdClass;
/**
* Tiny admin settings.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_management_table extends \core_admin\table\plugin_management_table {
/** @var plugininfo[] A list of blocks which cannot be deleted */
protected array $undeletableblocktypes;
/** @var stdClass[] A list of basic block data */
protected array $blockdata;
public function __construct() {
global $DB;
parent::__construct();
$this->undeletableblocktypes = \block_manager::get_undeletable_block_types();
$sql = <<<EOF
SELECT
b.name,
b.id,
b.name,
COUNT(DISTINCT binst.id) as totalcount,
COUNT(DISTINCT bcinst.id) as courseviewcount
FROM {block} b
LEFT JOIN {block_instances} binst ON binst.blockname = b.name
LEFT JOIN {block_instances} bcinst ON
bcinst.blockname = b.name AND
bcinst.pagetypepattern = 'course-view-*'
GROUP BY b.id, b.name, b.visible, binst.blockname, bcinst.blockname
ORDER BY b.name ASC
EOF;
$this->blockdata = $DB->get_records_sql($sql);
}
protected function get_plugintype(): string {
return 'block';
}
public function guess_base_url(): void {
$this->define_baseurl(
new moodle_url('/admin/blocks.php')
);
}
protected function get_action_url(array $params = []): moodle_url {
return new moodle_url('/admin/blocks.php', $params);
}
protected function get_table_js_module(): string {
return 'core_admin/block_management_table';
}
protected function get_column_list(): array {
$columns = parent::get_column_list();
return array_merge(
array_slice($columns, 0, 1, true),
['instances' => get_string('blockinstances', 'admin')],
array_slice($columns, 1, 2, true),
['protect' => get_string('blockprotect', 'admin')],
array_slice($columns, 3, null, true),
);
}
protected function get_columns_with_help(): array {
return [
'protect' => new \help_icon('blockprotect', 'admin'),
];
}
/**
* Render the instances column
* @param stdClass $row
* @return string
*/
protected function col_instances(stdClass $row): string {
$blockdata = $this->blockdata[$row->plugininfo->name];
if ($blockdata->courseviewcount > 0) {
return html_writer::link(
new moodle_url('/course/search.php', [
'blocklist' => $row->plugininfo->name,
'sesskey' => sesskey(),
]),
$blockdata->totalcount,
);
}
return $blockdata->totalcount;
}
/**
* Render the protect column.
*
* @param stdClass $row
* @return string
*/
protected function col_protect(stdClass $row): string {
global $OUTPUT;
$params = [
'sesskey' => sesskey(),
];
$protected = in_array($row->plugininfo->name, $this->undeletableblocktypes);
$pluginname = $row->plugininfo->displayname;
if ($protected) {
$params['unprotect'] = $row->plugininfo->name;
$icon = $OUTPUT->pix_icon('t/unlock', get_string('blockunprotectblock', 'admin', $pluginname));
} else {
$params['protect'] = $row->plugininfo->name;
$icon = $OUTPUT->pix_icon('t/lock', get_string('blockprotectblock', 'admin', $pluginname));
}
return html_writer::link(
$this->get_action_url($params),
$icon,
[
'data-action' => 'toggleprotectstate',
'data-plugin' => $row->plugin,
'data-target-state' => $protected ? 0 : 1,
],
);
return '';
}
}
@@ -0,0 +1,63 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use moodle_url;
/**
* Tiny admin settings.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class editor_management_table extends \core_admin\table\plugin_management_table {
protected function get_plugintype(): string {
return 'editor';
}
public function guess_base_url(): void {
$this->define_baseurl(
new moodle_url('/admin/settings.php', ['section' => 'manageeditors'])
);
}
protected function get_action_url(array $params = []): moodle_url {
return new moodle_url('/admin/editors.php', $params);
}
protected function order_plugins(array $plugins): array {
global $CFG;
// The Editor list is stored in an ordered string.
$activeeditors = explode(',', $CFG->texteditors);
$sortedplugins = [];
foreach ($activeeditors as $editor) {
if (isset($plugins[$editor])) {
$sortedplugins[$editor] = $plugins[$editor];
unset($plugins[$editor]);
}
}
$otherplugins = parent::order_plugins($plugins);
return array_merge(
$sortedplugins,
$otherplugins
);
}
}
@@ -0,0 +1,71 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use moodle_url;
use stdClass;
/**
* Media plugin admin settings.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class media_management_table extends \core_admin\table\plugin_management_table {
/** @var array The list of used extensions */
protected array $usedextensions = [];
protected function get_plugintype(): string {
return 'media';
}
protected function get_action_url(array $params = []): moodle_url {
return new moodle_url('/admin/media.php', $params);
}
protected function get_column_list(): array {
$columns = parent::get_column_list();
return array_merge(
array_slice($columns, 0, 1, true),
['supports' => get_string('supports', 'core_media')],
array_slice($columns, 1, null, true),
);
}
protected function col_name(stdClass $row): string {
global $OUTPUT, $PAGE;
$name = $row->plugininfo->name;
if ($PAGE->theme->resolve_image_location('icon', 'media_' . $name, false)) {
$icon = $OUTPUT->pix_icon('icon', '', "media_{$name}", ['class' => 'icon pluginicon']);
} else {
$icon = $OUTPUT->pix_icon('spacer', '', 'moodle', ['class' => 'icon pluginicon noicon']);
}
$help = '';
if (get_string_manager()->string_exists('pluginname_help', 'media_' . $name)) {
$help = '&nbsp;' . $OUTPUT->help_icon('pluginname', 'media_' . $name);
}
return $icon . $row->plugininfo->displayname . $help;
}
protected function col_supports(stdClass $row): string {
return $row->plugininfo->supports($this->usedextensions);
}
}
@@ -0,0 +1,503 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use context_system;
use core_plugin_manager;
use core_table\dynamic as dynamic_table;
use flexible_table;
use html_writer;
use moodle_url;
use stdClass;
defined('MOODLE_INTERNAL') || die();
require_once("{$CFG->libdir}/tablelib.php");
/**
* Plugin Management table.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class plugin_management_table extends flexible_table implements dynamic_table {
/** @var \core\plugininfo\base[] The plugin list */
protected array $plugins = [];
/** @var int The number of enabled plugins of this type */
protected int $enabledplugincount = 0;
/** @var core_plugin_manager */
protected core_plugin_manager $pluginmanager;
/** @var string The plugininfo class for this plugintype */
protected string $plugininfoclass;
public function __construct() {
global $CFG;
parent::__construct($this->get_table_id());
require_once($CFG->libdir . '/adminlib.php');
// Fetch the plugininfo class.
$this->pluginmanager = core_plugin_manager::instance();
$this->plugininfoclass = $this->pluginmanager::resolve_plugininfo_class($this->get_plugintype());
$this->guess_base_url();
$this->plugins = $this->get_sorted_plugins();
$this->enabledplugincount = count(array_filter($this->plugins, function ($plugin) {
return $plugin->is_enabled();
}));
$this->setup_column_configuration();
$this->set_filterset(new plugin_management_table_filterset());
$this->setup();
}
/**
* Get the list of sorted plugins.
*
* @return \core\plugininfo\base[]
*/
protected function get_sorted_plugins(): array {
if ($this->plugininfoclass::plugintype_supports_ordering()) {
return $this->plugininfoclass::get_sorted_plugins();
} else {
$plugins = $this->pluginmanager->get_plugins_of_type($this->get_plugintype());
return self::sort_plugins($plugins);
}
}
/**
* Sort the plugins list.
*
* Note: This only applies to plugins which do not support ordering.
*
* @param \core\plugininfo\base[] $plugins
* @return \core\plugininfo\base[]
*/
protected function sort_plugins(array $plugins): array {
// The asort functions work by reference.
\core_collator::asort_objects_by_property($plugins, 'displayname');
return $plugins;
}
/**
* Set up the column configuration for this table.
*/
protected function setup_column_configuration(): void {
$columnlist = $this->get_column_list();
$this->define_columns(array_keys($columnlist));
$this->define_headers(array_values($columnlist));
$columnswithhelp = $this->get_columns_with_help();
$columnhelp = array_map(function (string $column) use ($columnswithhelp): ?\renderable {
if (array_key_exists($column, $columnswithhelp)) {
return $columnswithhelp[$column];
}
return null;
}, array_keys($columnlist));
$this->define_help_for_headers($columnhelp);
}
/**
* Set the standard order of the plugins.
*
* @param array $plugins
* @return array
*/
protected function order_plugins(array $plugins): array {
uasort($plugins, function ($a, $b) {
if ($a->is_enabled() && !$b->is_enabled()) {
return -1;
} else if (!$a->is_enabled() && $b->is_enabled()) {
return 1;
}
return strnatcasecmp($a->name, $b->name);
});
return $plugins;
}
/**
* Get the plugintype for this table.
*
* @return string
*/
abstract protected function get_plugintype(): string;
/**
* Get the action URL for this table.
*
* The action URL is used to perform all actions when JS is not available.
*
* @param array $params
* @return moodle_url
*/
abstract protected function get_action_url(array $params = []): moodle_url;
/**
* Provide a default implementation for guessing the base URL from the action URL.
*/
public function guess_base_url(): void {
$this->define_baseurl($this->get_action_url());
}
/**
* Get the web service method used to toggle state.
*
* @return null|string
*/
protected function get_toggle_service(): ?string {
return 'core_admin_set_plugin_state';
}
/**
* Get the web service method used to order plugins.
*
* @return null|string
*/
protected function get_sortorder_service(): ?string {
return 'core_admin_set_plugin_order';
}
/**
* Get the ID of the table.
*
* @return string
*/
protected function get_table_id(): string {
return 'plugin_management_table-' . $this->get_plugintype();
}
/**
* Get a list of the column titles
* @return string[]
*/
protected function get_column_list(): array {
$columns = [
'name' => get_string('name', 'core'),
'version' => get_string('version', 'core'),
];
if ($this->supports_disabling()) {
$columns['enabled'] = get_string('pluginenabled', 'core_plugin');
}
if ($this->supports_ordering()) {
$columns['order'] = get_string('order', 'core');
}
$columns['settings'] = get_string('settings', 'core');
$columns['uninstall'] = get_string('uninstallplugin', 'core_admin');
return $columns;
}
protected function get_columns_with_help(): array {
return [];
}
/**
* Get the context for this table.
*
* @return context_system
*/
public function get_context(): context_system {
return context_system::instance();
}
/**
* Get the table content.
*/
public function get_content(): string {
ob_start();
$this->out();
$content = ob_get_contents();
ob_end_clean();
return $content;
}
/**
* Print the table.
*/
public function out(): void {
$plugintype = $this->get_plugintype();
foreach ($this->plugins as $plugininfo) {
$plugin = "{$plugintype}_{$plugininfo->name}";
$rowdata = (object) [
'plugin' => $plugin,
'plugininfo' => $plugininfo,
'name' => $plugininfo->displayname,
'version' => $plugininfo->versiondb,
];
$this->add_data_keyed(
$this->format_row($rowdata),
$this->get_row_class($rowdata)
);
}
$this->finish_output(false);
}
/**
* This table is not downloadable.
* @param bool $downloadable
* @return bool
*/
// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
public function is_downloadable($downloadable = null): bool {
return false;
}
/**
* Show the name column content.
*
* @param stdClass $row
* @return string
*/
protected function col_name(stdClass $row): string {
$status = $row->plugininfo->get_status();
if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
return html_writer::span(
get_string('pluginmissingfromdisk', 'core', $row->plugininfo),
'notifyproblem'
);
}
if ($row->plugininfo->is_installed_and_upgraded()) {
return $row->plugininfo->displayname;
}
return html_writer::span(
$row->plugininfo->displayname,
'notifyproblem'
);
}
/**
* Show the enable/disable column content.
*
* @param stdClass $row
* @return string
*/
protected function col_enabled(stdClass $row): string {
global $OUTPUT;
$enabled = $row->plugininfo->is_enabled();
$params = [
'sesskey' => sesskey(),
'plugin' => $row->plugininfo->name,
'action' => $enabled ? 'disable' : 'enable',
];
if ($enabled) {
$icon = $OUTPUT->pix_icon('t/hide', get_string('disableplugin', 'core_admin', $row->plugininfo->displayname));
} else {
$icon = $OUTPUT->pix_icon('t/show', get_string('enableplugin', 'core_admin', $row->plugininfo->displayname));
}
return html_writer::link(
$this->get_action_url($params),
$icon,
[
'data-toggle-method' => $this->get_toggle_service(),
'data-action' => 'togglestate',
'data-plugin' => $row->plugin,
'data-state' => $enabled ? 1 : 0,
],
);
}
protected function col_order(stdClass $row): string {
global $OUTPUT;
if (!$this->supports_ordering()) {
return '';
}
if (!$row->plugininfo->is_enabled()) {
return '';
}
if ($this->enabledplugincount <= 1) {
// There is only one row.
return '';
}
$hasup = true;
$hasdown = true;
if (empty($this->currentrow)) {
// This is the top row.
$hasup = false;
}
if ($this->currentrow === ($this->enabledplugincount - 1)) {
// This is the last row.
$hasdown = false;
}
if ($this->supports_ordering()) {
$dataattributes = [
'data-method' => $this->get_sortorder_service(),
'data-action' => 'move',
'data-plugin' => $row->plugin,
];
} else {
$dataattributes = [];
}
if ($hasup) {
$upicon = html_writer::link(
$this->get_action_url([
'sesskey' => sesskey(),
'action' => 'up',
'plugin' => $row->plugininfo->name,
]),
$OUTPUT->pix_icon('t/up', get_string('moveup')),
array_merge($dataattributes, ['data-direction' => 'up']),
);
} else {
$upicon = $OUTPUT->spacer();
}
if ($hasdown) {
$downicon = html_writer::link(
$this->get_action_url([
'sesskey' => sesskey(),
'action' => 'down',
'plugin' => $row->plugininfo->name,
]),
$OUTPUT->pix_icon('t/down', get_string('movedown')),
array_merge($dataattributes, ['data-direction' => 'down']),
);
} else {
$downicon = $OUTPUT->spacer();
}
// For now just add the up/down icons.
return html_writer::span($upicon . $downicon);
}
/**
* Show the settings column content.
*
* @param stdClass $row
* @return string
*/
protected function col_settings(stdClass $row): string {
if ($settingsurl = $row->plugininfo->get_settings_url()) {
return html_writer::link($settingsurl, get_string('settings'));
}
return '';
}
/**
* Show the Uninstall column content.
*
* @param stdClass $row
* @return string
*/
protected function col_uninstall(stdClass $row): string {
$status = $row->plugininfo->get_status();
if ($status === core_plugin_manager::PLUGIN_STATUS_NEW) {
return get_string('status_new', 'core_plugin');
}
if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
$uninstall = get_string('status_missing', 'core_plugin') . '<br/>';
} else {
$uninstall = '';
}
if ($uninstallurl = $this->pluginmanager->get_uninstall_url($row->plugin)) {
$uninstall .= html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'));
}
return $uninstall;
}
/**
* Get the JS module used to manage this table.
*
* This should be a class which extends 'core_admin/plugin_management_table'.
*
* @return string
*/
protected function get_table_js_module(): string {
return 'core_admin/plugin_management_table';
}
/**
* Add JS specific to this implementation.
*
* @return string
*/
protected function get_dynamic_table_html_end(): string {
global $PAGE;
$PAGE->requires->js_call_amd($this->get_table_js_module(), 'init');
return parent::get_dynamic_table_html_end();
}
/**
* Get any class to add to the row.
*
* @param mixed $row
* @return string
*/
protected function get_row_class($row): string {
$plugininfo = $row->plugininfo;
if ($plugininfo->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
return '';
}
if (!$plugininfo->is_enabled()) {
return 'dimmed_text';
}
return '';
}
public static function get_filterset_class(): string {
return self::class . '_filterset';
}
/**
* Whether this plugin type supports the disabling of plugins.
*
* @return bool
*/
protected function supports_disabling(): bool {
return $this->plugininfoclass::plugintype_supports_disabling();
}
/**
* Whether this table should show ordering fields.
*
* @return bool
*/
protected function supports_ordering(): bool {
return $this->plugininfoclass::plugintype_supports_ordering();
}
}
@@ -0,0 +1,27 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
/**
* This file contains the dynamic interface.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class plugin_management_table_filterset extends \core_table\local\filter\filterset {
}
@@ -0,0 +1,50 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_admin\table;
use moodle_url;
/**
* Tiny admin settings.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_plugin_management_table extends \core_admin\table\plugin_management_table {
protected function get_plugintype(): string {
return 'tool';
}
public function guess_base_url(): void {
$this->define_baseurl(
new moodle_url('/admin/tools.php')
);
}
protected function get_column_list(): array {
$columns = parent::get_column_list();
unset($columns['settings']);
return $columns;
}
protected function get_action_url(array $params = []): moodle_url {
return new moodle_url('/admin/tool.php', $params);
}
}
+72 -29
View File
@@ -27,23 +27,28 @@ define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once("{$CFG->libdir}/clilib.php");
require_once("{$CFG->libdir}/cronlib.php");
list($options, $unrecognized) = cli_get_params(
[
'execute' => false,
'help' => false,
'keep-alive' => 0,
'showsql' => false,
'showdebugging' => false,
'execute' => false,
'keep-alive' => 0,
'ignorelimits' => false,
'force' => false,
'id' => null,
'classname' => null,
'taskslimit' => null,
'failed' => false,
], [
'h' => 'help',
'e' => 'execute',
'k' => 'keep-alive',
'i' => 'ignorelimits',
'f' => 'force',
'c' => 'classname',
'l' => 'taskslimit',
]
);
@@ -52,8 +57,7 @@ if ($unrecognized) {
cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
}
if ($options['help'] or empty($options['execute'])) {
$help = <<<EOT
$help = <<<EOT
Ad hoc cron tasks.
Options:
@@ -64,22 +68,32 @@ Options:
-k, --keep-alive=N Keep this script alive for N seconds and poll for new adhoc tasks
-i --ignorelimits Ignore task_adhoc_concurrency_limit and task_adhoc_max_runtime limits
-f, --force Run even if cron is disabled
--id Run (failed) task with id
-c, --classname Run tasks with a certain classname (FQN)
-l, --taskslimit=N Run at most N tasks
--failed Run only tasks that failed, ie those with a fail delay
Example:
Run all queued tasks:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --execute
Run all queued tasks of specific class:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --classname=\\\\core_course\\\\task\\\\course_delete_modules
Double backslash for the shell escape reasons.
Run a specific task:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --id=123456
Run a specific task with debugging:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --id=123456 --showsql --showdebugging
To profile a long running task:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --taskslimit=1 --classname='\\some\\class\\name' --ignorelimits
EOT;
if ($options['help']) {
echo $help;
die;
}
if ($options['showdebugging']) {
set_debugging(DEBUG_DEVELOPER, true);
}
if ($options['showsql']) {
$DB->set_debug(true);
exit(0);
}
if (CLI_MAINTENANCE) {
@@ -92,17 +106,18 @@ if (moodle_needs_upgrading()) {
exit(1);
}
if (empty($options['execute'])) {
exit(0);
}
if (!get_config('core', 'cron_enabled') && !$options['force']) {
mtrace('Cron is disabled. Use --force to override.');
exit(1);
}
if (empty($options['keep-alive'])) {
$options['keep-alive'] = 0;
// Common debugging options.
if ($options['showdebugging']) {
set_debugging(DEBUG_DEVELOPER, true);
}
if ($options['showsql']) {
$DB->set_debug(true);
}
if (!empty($CFG->showcronsql)) {
@@ -112,20 +127,48 @@ if (!empty($CFG->showcrondebugging)) {
set_debugging(DEBUG_DEVELOPER, true);
}
$checklimits = empty($options['ignorelimits']);
// Process params.
core_php_time_limit::raise();
// Increase memory limit.
raise_memory_limit(MEMORY_EXTRA);
// Emulate normal session - we use admin account by default.
cron_setup_user();
$humantimenow = date('r', time());
$keepalive = (int)$options['keep-alive'];
\core\cron::setup_user();
\core\local\cli\shutdown::script_supports_graceful_exit();
$humantimenow = date('r', time());
mtrace("Server Time: {$humantimenow}\n");
cron_run_adhoc_tasks(time(), $keepalive, $checklimits);
$classname = $options['classname'];
// Run a single adhoc task only, if requested.
if (!empty($options['id'])) {
$taskid = (int) $options['id'];
\core\cron::run_adhoc_task($taskid);
exit(0);
}
// Run all failed tasks.
if (!empty($options['failed'])) {
\core\cron::run_failed_adhoc_tasks($classname);
exit(0);
}
// Examine params and determine if we should run.
$execute = (bool) $options['execute'];
$keepalive = empty($options['keep-alive']) ? 0 : (int) $options['keep-alive'];
$taskslimit = empty($options['taskslimit']) ? null : (int) $options['taskslimit'];
$checklimits = empty($options['ignorelimits']);
if ($classname || $keepalive || $taskslimit) {
$execute = true;
}
// Output the help text if no criteria for running the adhoc tasks are given.
if (!$execute) {
echo $help;
exit(0);
}
\core\cron::run_adhoc_tasks(time(), $keepalive, $checklimits, null, $taskslimit, $classname);
+4 -5
View File
@@ -30,7 +30,6 @@ define('CLI_SCRIPT', true);
require(__DIR__.'/../../config.php');
require_once($CFG->libdir.'/clilib.php'); // cli only functions
require_once($CFG->libdir.'/cronlib.php');
// now get cli options
list($options, $unrecognized) = cli_get_params(array('help'=>false),
@@ -80,10 +79,10 @@ if (!empty($CFG->showcrondebugging)) {
$starttime = microtime();
/// emulate normal session
cron_setup_user();
// Emulate normal session.
\core\cron::setup_user();
/// Start output log
// Start output log.
$timenow = time();
mtrace("Server Time: ".date('r',$timenow)."\n\n");
@@ -96,4 +95,4 @@ backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper:
mtrace("Automated cron backups completed correctly");
$difftime = microtime_diff($starttime, microtime());
mtrace("Execution took ".$difftime." seconds");
mtrace("Execution took ".$difftime." seconds");
+21 -13
View File
@@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@@ -30,12 +29,11 @@
define('CLI_SCRIPT', true);
require(__DIR__.'/../../config.php');
require_once($CFG->libdir.'/clilib.php'); // cli only functions
require_once($CFG->libdir.'/cronlib.php');
require(__DIR__ . '/../../config.php');
require_once($CFG->libdir . '/clilib.php');
// now get cli options
list($options, $unrecognized) = cli_get_params(
// Now get cli option.
[$options, $unrecognized] = cli_get_params(
[
'help' => false,
'stop' => false,
@@ -44,7 +42,9 @@ list($options, $unrecognized) = cli_get_params(
'enable' => false,
'disable' => false,
'disable-wait' => false,
], [
'keep-alive' => null,
],
[
'h' => 'help',
's' => 'stop',
'l' => 'list',
@@ -52,6 +52,7 @@ list($options, $unrecognized) = cli_get_params(
'e' => 'enable',
'd' => 'disable',
'w' => 'disable-wait',
'k' => 'keep-alive',
]
);
@@ -62,7 +63,7 @@ if ($unrecognized) {
if ($options['help']) {
$help =
"Execute periodic cron actions.
"Execute periodic cron actions.
Options:
-h, --help Print out this help
@@ -72,6 +73,9 @@ Options:
-e, --enable Enable cron
-d, --disable Disable cron
-w, --disable-wait=600 Disable cron and wait until all tasks finished or fail after N seconds (optional param)
-k, --keep-alive=N Keep this script alive for N seconds and poll for new tasks
The default value can be set by administrators in:
Site administration > Server > Tasks > Task processing > Keep alive time
Example:
\$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -105,7 +109,8 @@ if ($options['list']) {
$tasks = \core\task\manager::get_running_tasks();
mtrace('The list of currently running tasks:');
$format = "%7s %-12s %-9s %-20s %-52s\n";
printf ($format,
printf(
$format,
'PID',
'HOST',
'TYPE',
@@ -113,7 +118,8 @@ if ($options['list']) {
'CLASSNAME'
);
foreach ($tasks as $task) {
printf ($format,
printf(
$format,
$task->pid,
substr($task->hostname, 0, 12),
$task->type,
@@ -137,7 +143,7 @@ if ($wait = $options['disable-wait']) {
set_config('cron_enabled', 0);
\core\task\manager::clear_static_caches();
mtrace('Cron has been disabled for the site.');
mtrace('Allocating '. format_time($waitsec) . ' for the tasks to finish.');
mtrace('Allocating ' . format_time($waitsec) . ' for the tasks to finish.');
$lastcount = 0;
while ($wait) {
@@ -151,7 +157,7 @@ if ($wait = $options['disable-wait']) {
if (time() - $started >= $waitsec) {
mtrace('');
mtrace('Wait time ('. format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
mtrace('Wait time (' . format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
mtrace('Exiting with code 1.');
exit(1);
}
@@ -175,4 +181,6 @@ if (!get_config('core', 'cron_enabled') && !$options['force']) {
\core\local\cli\shutdown::script_supports_graceful_exit();
cron_run();
$keepalive = $options['keep-alive'];
\core\cron::run_main_process($keepalive);
-1
View File
@@ -28,7 +28,6 @@ define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once($CFG->libdir . '/clilib.php');
require_once($CFG->libdir . '/cronlib.php');
list($options, $unrecognized) = cli_get_params(
[
+209
View File
@@ -0,0 +1,209 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* This script allows you to view and change the emailstop flag of any user.
*
* @package core
* @subpackage cli
* @copyright 2023 Stephan Robotta (stephan.robotta@bfh.ch)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('CLI_SCRIPT', true);
require(__DIR__.'/../../config.php');
require_once($CFG->libdir.'/clilib.php');
// Define the input options.
$longparams = [
'email' => '',
'help' => false,
'id' => '',
'quiet' => false,
'stop' => '',
'username' => '',
];
$shortparams = [
'e' => 'email',
'h' => 'help',
'i' => 'id',
'q' => 'quiet',
's' => 'stop',
'u' => 'username',
];
// Define exit codes.
$exitsuccess = 0;
$exitunknownoption = 1;
$exitmissinguserarg = 2;
$exittoomanyuserarg = 3;
$exitnosearchargs = 4;
$exitnousersfound = 5;
$exitinvalidstopflag = 6;
$exiterrordb = 7;
// Now get cli options that are set by the caller.
list($options, $unrecognized) = cli_get_params($longparams, $shortparams);
$verbose = empty($options['quiet']);
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
if ($verbose) {
cli_error(get_string('cliunknowoption', 'admin', $unrecognized), $exitunknownoption);
}
exit($exitunknownoption);
}
if ($options['help']) {
$help =
"Set/unset or show status of emailstop flag for a user, identified by username or email.
There are no security checks here because anybody who is able to
execute this file may execute any PHP too.
Options:
-h, --help Print out this help
-e, --email=email Specify user by email, separate many users by comma
-i, --id=id Specify user by id, separate many users by comma
-q, --quiet No output to stdout
-s, --stop=0|1|off|on Set new value for emailstop flag
-u, --username=username Specify user by username, separate many users by comma
Example:
\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --email=student1@example.com --stop=1
\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --email=student1@example.com,student2@example.com
\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --u=student1,student2 -s=on
";
echo $help;
exit($exitsuccess);
}
$cntempty = 0;
$cntfilled = 0;
$searchargs = [];
// Try to find out which option is used to fetch the users from. Also do sanitize etc.
foreach (['email', 'username', 'id'] as $option) {
if (empty($options[$option])) {
$cntempty++;
} else {
$cntfilled++;
$argname = $option;
// The search args must be: split by the comma, trimmed, and empty elements filtered out.
$searchargs = array_flip(array_filter(
array_map(
function ($item) {
return trim($item);
},
explode(',', $options[$option])
),
function ($item) {
return $item !== '';
}
));
}
}
if ($cntempty === 3) {
if ($verbose) {
cli_error('One of username, email, or id must be set.', $exitmissinguserarg);
}
exit($exitmissinguserarg);
}
if ($cntfilled > 1) {
if ($verbose) {
cli_error('Only one of email, username, or id can be set to identify a user.', $exittoomanyuserarg);
}
exit($exittoomanyuserarg);
}
if (empty($searchargs)) {
if ($verbose) {
cli_error('No values are provided for users.', $exitnosearchargs);
}
exit($exitnosearchargs);
}
try {
$users = $DB->get_records_list('user', $argname, array_keys($searchargs));
} catch (Exception $e) {
if ($verbose) {
cli_error("Could not fetch data from db by {$argname}: '{$options[$argname]}'.", $exiterrordb);
}
exit($exiterrordb);
}
if (empty($users)) {
if ($verbose) {
cli_error("Can not find any user by {$argname}: '{$options[$argname]}'.", $exitnousersfound);
}
exit($exitnousersfound);
}
// No stop flag set, then just print the user and the current emailstop flag state.
if ($options['stop'] === '') {
foreach ($users as $user) {
if ($verbose) {
echo 'user=' . $user->{$argname} . ' - emailstop=' . (int)$user->emailstop . PHP_EOL;
unset($searchargs[$user->{$argname}]);
}
}
if ($verbose) {
foreach (array_keys($searchargs) as $arg) {
echo 'user=' . $arg . ' - not found' . PHP_EOL;
}
}
exit($exitsuccess);
}
// Allowed values for the stop flag enabled are 1 and on, for disabled are 0 and off.
$validvalues = ['0', '1', 'off', 'on'];
$stopflag = strtolower($options['stop']);
if (!in_array($stopflag, $validvalues)) {
if ($verbose) {
cli_error('Value for the emailstop flag must be one of: ' . implode(', ', $validvalues) . '.', $exitinvalidstopflag);
}
exit($exitinvalidstopflag);
}
foreach ($validvalues as $value) {
if ($value === $stopflag) {
$stopflag = ($value === '1' || $value === 'on') ? 1 : 0;
break;
}
}
// Update each user with the stop flag to be set if it is necessary.
foreach ($users as $user) {
$line = 'Update user ' . $user->{$argname} . ($argname !== 'id' ? ' (' . $user->id . ')' : '') . ' - ';
if ((int)$user->emailstop !== $stopflag) {
$DB->set_field('user', 'emailstop', $stopflag, ['id' => $user->id]);
$line .= 'ok';
} else {
$line .= 'already done';
}
if ($verbose) {
echo $line . PHP_EOL;
unset($searchargs[$user->{$argname}]);
}
}
if ($verbose) {
foreach (array_keys($searchargs) as $arg) {
echo 'user=' . $arg . ' - not found' . PHP_EOL;
}
}
exit($exitsuccess);
+2 -3
View File
@@ -27,7 +27,6 @@ define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once("$CFG->libdir/clilib.php");
require_once("$CFG->libdir/cronlib.php");
list($options, $unrecognized) = cli_get_params(
[
@@ -142,7 +141,7 @@ if ($execute = $options['execute']) {
raise_memory_limit(MEMORY_EXTRA);
// Emulate normal session - we use admin account by default.
cron_setup_user();
\core\cron::setup_user();
// Execute the task.
\core\local\cli\shutdown::script_supports_graceful_exit();
@@ -164,5 +163,5 @@ if ($execute = $options['execute']) {
$task->set_cron_lock($cronlock);
}
cron_run_inner_scheduled_task($task);
\core\cron::run_inner_scheduled_task($task);
}
+114 -28
View File
@@ -48,12 +48,16 @@ require_once($CFG->libdir.'/environmentlib.php');
$lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang;
list($options, $unrecognized) = cli_get_params(
array(
'non-interactive' => false,
'allow-unstable' => false,
'help' => false,
'lang' => $lang,
'verbose-settings' => false,
'is-pending' => false,
'allow-unstable' => false,
'help' => false,
'is-maintenance-required' => false,
'is-pending' => false,
'lang' => $lang,
'maintenance' => true,
'non-interactive' => false,
'set-ui-upgrade-lock' => false,
'unset-ui-upgrade-lock' => false,
'verbose-settings' => false,
),
array(
'h' => 'help'
@@ -79,19 +83,35 @@ Please note you must execute this script with the same uid as apache!
Site defaults may be changed via local/defaults.php.
Options:
--non-interactive No interactive questions or confirmations
--allow-unstable Upgrade even if the version is not marked as stable yet,
required in non-interactive mode.
--lang=CODE Set preferred language for CLI output. Defaults to the
site language if not set. Defaults to 'en' if the lang
parameter is invalid or if the language pack is not
installed.
--verbose-settings Show new settings values. By default only the name of
new core or plugin settings are displayed. This option
outputs the new values as well as the setting name.
--is-pending If an upgrade is needed it exits with an error code of
2 so it distinct from other types of errors.
-h, --help Print out this help
--allow-unstable Upgrade even if the version is not marked as stable yet,
required in non-interactive mode.
-h, --help Print out this help.
--is-maintenance-required Returns exit code 2 if the upgrade requires maintenance mode.
Returns exit code 3 if no maintenance is required for the upgrade.
--is-pending Exit with error code 2 if an upgrade is required.
--lang=CODE Set preferred language for CLI output. Defaults to the
site language if not set. Defaults to 'en' if the lang
parameter is invalid or if the language pack is not
installed.
--maintenance Sets whether this upgrade will use maintenance mode.
If not possible, the upgrade will not happen and the script will exit.
WARNING: Caches (except theme) will be STALE and MUST be purged after upgrading.
DO NOT USE if the upgrade contains known breaking changes to the way data
and the database interact.
RECOMMENDED for lightweight deployments, to allow for a graceful purge and
rebuild of the cache.
--non-interactive No interactive questions or confirmations.
--set-ui-upgrade-lock Sets the upgrade to CLI only and unable to be triggered from the frontend.
If called with --maintenance=false, the lock WILL NOT be released when the
upgrade finishes, and MUST be manually removed.
If called with --is-maintenance-required before an upgrade,
The lock WILL be released when the upgrade finishes.
--unset-ui-upgrade-lock Removes the frontend upgrade lock, if the lock exists.
Useful when an error during the upgrade leaves the upgrade locked,
or there is need to control the time where the unlock happens.
--verbose-settings Show new settings values. By default only the name of
new core or plugin settings are displayed. This option
outputs the new values as well as the setting name.
Example:
\$sudo -u www-data /usr/bin/php admin/cli/upgrade.php
@@ -115,12 +135,58 @@ if ($version < $CFG->version) {
$oldversion = "$CFG->release ($CFG->version)";
$newversion = "$release ($version)";
if (!moodle_needs_upgrading()) {
if ($options['unset-ui-upgrade-lock']) {
// Unconditionally unset this config if requested.
set_config('outagelessupgrade', false);
cli_writeln(get_string('cliupgradeunsetlock', 'admin'));
}
$allhash = core_component::get_all_component_hash();
// Initialise allcomponent hash if not set. It will be correctly set after upgrade.
$CFG->allcomponenthash = $CFG->allcomponenthash ?? '';
if (!$options['maintenance']) {
if ($allhash !== $CFG->allcomponenthash) {
// Throw an error here, we can't proceed, this needs to set maintenance.
cli_error(get_string('cliupgrademaintenancerequired', 'core_admin'), 2);
}
// Set a constant to stop any upgrade var from being set during processing.
// This protects against the upgrade setting timeouts and maintenance during the upgrade.
define('CLI_UPGRADE_RUNNING', true);
// This database control is the control to block the GUI from doing upgrade related actions.
set_config('outagelessupgrade', true);
}
// We should ignore all upgrade locks here.
if (!moodle_needs_upgrading(false)) {
cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
}
if ($options['is-pending']) {
cli_error(get_string('cliupgradepending', 'core_admin'), 2);
// Handle exit based options for outputting upgrade state.
if ($options['is-pending'] || $options['is-maintenance-required']) {
// If we aren't doing a maintenance check, plain pending check.
if (!$options['is-maintenance-required']) {
cli_error(get_string('cliupgradepending', 'core_admin'), 2);
}
// Can we do this safely with no maintenance/outage? Detect if there is a schema or other application state change.
if ($allhash !== $CFG->allcomponenthash) {
// State change here, we need to do this in maintenance.
cli_writeln(get_string('cliupgradepending', 'core_admin'));
cli_error(get_string('cliupgrademaintenancerequired', 'core_admin'), 2);
}
// If requested, we should always set the upgrade lock here, so this cannot be run from frontend.
if ($options['set-ui-upgrade-lock']) {
set_config('outagelessupgrade', true);
cli_writeln(get_string('cliupgradesetlock', 'admin'));
}
// We can do an upgrade without maintenance!
cli_writeln(get_string('cliupgradepending', 'core_admin'));
cli_error(get_string('cliupgrademaintenancenotrequired', 'core_admin'), 3);
}
// Test environment first.
@@ -187,12 +253,18 @@ if ($interactive) {
}
if ($version > $CFG->version) {
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
// Only purge caches if this is a plain upgrade.
// In the case of a no-outage upgrade, we will gracefully roll caches after upgrade.
if ($options['maintenance']) {
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
}
upgrade_core($version, true);
}
set_config('release', $release);
@@ -230,4 +302,18 @@ foreach ($settingsoutput as $setting => $value) {
upgrade_themes();
echo get_string('cliupgradefinished', 'admin', $a)."\n";
if (!$options['maintenance']) {
cli_writeln(get_string('cliupgradecompletenomaintenanceupgrade', 'admin'));
// Here we check if upgrade lock has not been specifically set during this upgrade run.
// This supports wider server orchestration actions happening, which should call with no-maintenance AND set-ui-upgrade-lock,
// such as a new docker container deployment, of which the moodle upgrade is only a component.
if (!$options['set-ui-upgrade-lock']) {
// In this case we should release the lock now, as the upgrade is finished.
// We weren't told to keep the lock with set-ui-upgrade-lock, so release.
set_config('outagelessupgrade', false);
}
}
exit(0); // 0 means success
+79
View File
@@ -0,0 +1,79 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Reset course indentation
*
* @copyright 2023 Amaia Anabitarte <amaia@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once('../../config.php');
require_admin();
$format = required_param('format', PARAM_PLUGIN);
$confirm = optional_param('confirm', false, PARAM_BOOL);
$backurl = new moodle_url('/admin/settings.php', ['section' => 'formatsetting'.$format]);
$PAGE->set_url('/admin/course/resetindentation.php', ['format' => $format]);
$PAGE->set_context(context_system::instance());
if ($confirm) {
require_sesskey();
$courses = $DB->get_records('course', ['format' => $format], 'id', 'id');
if (!empty($courses)) {
$courseids = array_keys($courses);
list($courseinsql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'course');
$DB->set_field_select('course_modules', 'indent', '0', "course $courseinsql AND indent <> 0", $courseparams);
rebuild_course_cache(0, true);
}
redirect(
$backurl,
get_string('resetindentationsuccess', 'admin'),
null,
\core\output\notification::NOTIFY_SUCCESS
);
}
$strtitle = get_string('resetindentation', 'admin');
$PAGE->set_title($strtitle);
$PAGE->set_heading($strtitle);
navigation_node::override_active_url(new moodle_url(
'/admin/course/resetindentation.php',
['action' => 'confirm', 'format' => $format]
));
echo $OUTPUT->header();
$displayoptions = ['confirmtitle' => get_string('resetindentation_title', 'admin')];
$confirmbutton = new single_button(
new moodle_url('/admin/course/resetindentation.php', ['confirm' => 1, 'format' => $format, 'sesskey' => sesskey()]),
get_string('resetindentation', 'admin'),
'post',
single_button::BUTTON_DANGER
);
$cancelbutton = new single_button($backurl, get_string('cancel'));
echo $OUTPUT->confirm(
get_string('resetindentation_help', 'admin', ['format' => get_string('pluginname', 'format_'.$format)]),
$confirmbutton,
$cancelbutton,
$displayoptions
);
echo $OUTPUT->footer();
+6 -7
View File
@@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@@ -36,6 +35,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// phpcs:ignoreFile moodle.Files.MoodleInternal.MoodleInternalGlobalState
if (defined('STDIN')) {
fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
@@ -49,8 +49,7 @@ define('WEB_CRON_EMULATED_CLI', 'defined'); // ugly ugly hack, do not use elsewh
define('NO_OUTPUT_BUFFERING', true);
require('../config.php');
require_once($CFG->libdir.'/clilib.php');
require_once($CFG->libdir.'/cronlib.php');
require_once($CFG->libdir . '/clilib.php');
// extra safety
\core\session\manager::write_close();
@@ -71,11 +70,11 @@ if (!empty($CFG->cronremotepassword)) {
}
}
// send mime type and encoding
// Send mime type and encoding.
@header('Content-Type: text/plain; charset=utf-8');
// we do not want html markup in emulated CLI
// We do not want html markup in emulated CLI.
@ini_set('html_errors', 'off');
// execute the cron
cron_run();
// Execute the cron, disabling keepalive.
\core\cron::run_main_process(0);
+55 -49
View File
@@ -1,87 +1,95 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Allows admin to configure editors.
* A page to manage editor plugins.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once('../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/tablelib.php');
require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->libdir . '/tablelib.php');
$action = required_param('action', PARAM_ALPHANUMEXT);
$editor = required_param('editor', PARAM_PLUGIN);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$action = required_param('action', PARAM_ALPHANUMEXT);
$plugin = required_param('plugin', PARAM_PLUGIN);
$PAGE->set_url('/admin/editors.php', array('action'=>$action, 'editor'=>$editor));
$PAGE->set_url('/admin/editors.php', ['action' => $action, 'editor' => $plugin]);
$PAGE->set_context(context_system::instance());
require_admin();
require_sesskey();
$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageeditors";
$returnurl = new moodle_url('/admin/settings.php', ['section' => 'manageeditors']);
// get currently installed and enabled auth plugins
$available_editors = editors_get_available();
if (!empty($editor) and empty($available_editors[$editor])) {
redirect ($returnurl);
}
$active_editors = explode(',', $CFG->texteditors);
foreach ($active_editors as $key=>$active) {
if (empty($available_editors[$active])) {
unset($active_editors[$key]);
}
}
////////////////////////////////////////////////////////////////////////////////
// process actions
if (!confirm_sesskey()) {
// Get currently installed and enabled auth plugins.
$availableeditors = editors_get_available();
if (!empty($plugin) && empty($availableeditors[$plugin])) {
redirect($returnurl);
}
$return = true;
$activeeditors = explode(',', $CFG->texteditors);
foreach ($activeeditors as $key => $active) {
if (empty($availableeditors[$active])) {
unset($activeeditors[$key]);
}
}
switch ($action) {
case 'disable':
// Remove from enabled list.
$class = \core_plugin_manager::resolve_plugininfo_class('editor');
$class::enable_plugin($editor, false);
$class::enable_plugin($plugin, false);
break;
case 'enable':
// Add to enabled list.
if (!in_array($editor, $active_editors)) {
if (!in_array($plugin, $activeeditors)) {
$class = \core_plugin_manager::resolve_plugininfo_class('editor');
$class::enable_plugin($editor, true);
$class::enable_plugin($plugin, true);
}
break;
case 'down':
$key = array_search($editor, $active_editors);
// check auth plugin is valid
$key = array_search($plugin, $activeeditors);
if ($key !== false) {
// move down the list
if ($key < (count($active_editors) - 1)) {
$fsave = $active_editors[$key];
$active_editors[$key] = $active_editors[$key + 1];
$active_editors[$key + 1] = $fsave;
add_to_config_log('editor_position', $key, $key + 1, $editor);
set_config('texteditors', implode(',', $active_editors));
// Move down the list.
if ($key < (count($activeeditors) - 1)) {
$fsave = $activeeditors[$key];
$activeeditors[$key] = $activeeditors[$key + 1];
$activeeditors[$key + 1] = $fsave;
add_to_config_log('editor_position', $key, $key + 1, $plugin);
set_config('texteditors', implode(',', $activeeditors));
core_plugin_manager::reset_caches();
}
}
break;
case 'up':
$key = array_search($editor, $active_editors);
// check auth is valid
$key = array_search($plugin, $activeeditors);
if ($key !== false) {
// move up the list
// Move up the list.
if ($key >= 1) {
$fsave = $active_editors[$key];
$active_editors[$key] = $active_editors[$key - 1];
$active_editors[$key - 1] = $fsave;
add_to_config_log('editor_position', $key, $key - 1, $editor);
set_config('texteditors', implode(',', $active_editors));
$fsave = $activeeditors[$key];
$activeeditors[$key] = $activeeditors[$key - 1];
$activeeditors[$key - 1] = $fsave;
add_to_config_log('editor_position', $key, $key - 1, $plugin);
set_config('texteditors', implode(',', $activeeditors));
core_plugin_manager::reset_caches();
}
}
@@ -91,6 +99,4 @@ switch ($action) {
break;
}
if ($return) {
redirect ($returnurl);
}
redirect($returnurl);
+192
View File
@@ -3371,6 +3371,7 @@
<VENDOR name="oracle" version="11.2" />
</DATABASE>
<PHP version="7.3.0" level="required">
<RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@@ -3557,6 +3558,7 @@
<VENDOR name="oracle" version="11.2" />
</DATABASE>
<PHP version="7.3.0" level="required">
<RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@@ -3749,6 +3751,7 @@
<VENDOR name="oracle" version="19" />
</DATABASE>
<PHP version="7.4.0" level="required">
<RESTRICT function="restrict_php_version_82" message="unsupportedphpversion82" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@@ -3922,4 +3925,193 @@
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="4.2" requires="3.11.8">
<UNICODE level="required">
<FEEDBACK>
<ON_ERROR message="unicoderequired" />
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
<VENDOR name="mariadb" version="10.6.7" />
<VENDOR name="mysql" version="8.0" />
<VENDOR name="postgres" version="13" />
<VENDOR name="mssql" version="14.0" />
<VENDOR name="oracle" version="19" />
</DATABASE>
<PHP version="8.0.0" 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="required">
<FEEDBACK>
<ON_ERROR message="mbstringrequired" />
</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="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="required">
<FEEDBACK>
<ON_ERROR message="intlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="json" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="hash" level="required"/>
<PHP_EXTENSION name="fileinfo" level="required"/>
<PHP_EXTENSION name="sodium" level="required"/>
<PHP_EXTENSION name="exif" level="optional"/>
</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_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
<FEEDBACK>
<ON_ERROR message="sixtyfourbitsrequired" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
<FEEDBACK>
<ON_CHECK message="iscustomadminwarnings" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
+331 -324
View File
@@ -302,262 +302,77 @@ if (empty($CFG->version)) {
throw new \moodle_exception('missingconfigversion', 'debug');
}
// Detect config cache inconsistency, this happens when you switch branches on dev servers.
if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
purge_all_caches();
redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
}
if (!$cache and $version > $CFG->version) { // upgrade
$PAGE->set_url(new moodle_url($PAGE->url, array(
'confirmupgrade' => $confirmupgrade,
'confirmrelease' => $confirmrelease,
'confirmplugincheck' => $confirmplugins,
)));
check_upgrade_key($upgradekeyhash);
// Warning about upgrading a test site.
$testsite = false;
if (defined('BEHAT_SITE_RUNNING')) {
$testsite = 'behat';
// If an upgrade is running, an admin page starting a frontend upgrade could corrupt the
// DB if the upgrade collided with an already running upgrade process at the wrong time.
// Pull the value direct from the DB, this needs to *always* be correct.
$outagelessupgrade = !empty($DB->get_field('config', 'value', ['name' => 'outagelessupgrade']));
if (!$outagelessupgrade) {
// Detect config cache inconsistency, this happens when you switch branches on dev servers.
if ($CFG->version != $DB->get_field('config', 'value', array('name' => 'version'))) {
purge_all_caches();
redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
}
if (isset($CFG->themerev)) {
// Store the themerev to restore after purging caches.
$themerev = $CFG->themerev;
}
if (!$cache && $version > $CFG->version && !$outagelessupgrade) { // Upgrade.
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
// We then purge the regular caches.
purge_all_caches();
$PAGE->set_url(new moodle_url($PAGE->url, array(
'confirmupgrade' => $confirmupgrade,
'confirmrelease' => $confirmrelease,
'confirmplugincheck' => $confirmplugins,
)));
if (isset($themerev)) {
// Restore the themerev
set_config('themerev', $themerev);
}
check_upgrade_key($upgradekeyhash);
$output = $PAGE->get_renderer('core', 'admin');
if (upgrade_stale_php_files_present()) {
$PAGE->set_title($stradministration);
$PAGE->set_cacheable(false);
echo $output->upgrade_stale_php_files_page();
die();
}
if (empty($confirmupgrade)) {
$a = new stdClass();
$a->oldversion = "$CFG->release (".sprintf('%.2f', $CFG->version).")";
$a->newversion = "$release (".sprintf('%.2f', $version).")";
$strdatabasechecking = get_string('databasechecking', '', $a);
$PAGE->set_title($stradministration);
$PAGE->set_heading($strdatabasechecking);
$PAGE->set_cacheable(false);
echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
die();
} else if (empty($confirmrelease)) {
require_once($CFG->libdir.'/environmentlib.php');
list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
$strcurrentrelease = get_string('currentrelease');
$PAGE->navbar->add($strcurrentrelease);
$PAGE->set_title($strcurrentrelease);
$PAGE->set_heading($strcurrentrelease);
$PAGE->set_cacheable(false);
echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
die();
} else if (empty($confirmplugins)) {
$strplugincheck = get_string('plugincheck');
$PAGE->navbar->add($strplugincheck);
$PAGE->set_title($strplugincheck);
$PAGE->set_heading($strplugincheck);
$PAGE->set_cacheable(false);
$pluginman = core_plugin_manager::instance();
// Check for available updates.
if ($fetchupdates) {
// No sesskey support guaranteed here, because sessions might not work yet.
$updateschecker = \core\update\checker::instance();
if ($updateschecker->enabled()) {
$updateschecker->fetch();
}
redirect($PAGE->url);
// Warning about upgrading a test site.
$testsite = false;
if (defined('BEHAT_SITE_RUNNING')) {
$testsite = 'behat';
}
// Cancel all plugin installations.
if ($abortinstallx) {
// No sesskey support guaranteed here, because sessions might not work yet.
$abortables = $pluginman->list_cancellable_installations();
if ($abortables) {
if ($confirmabortinstall) {
foreach ($abortables as $plugin) {
$pluginman->cancel_plugin_installation($plugin->component);
}
redirect($PAGE->url);
} else {
$continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1));
echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
die();
}
}
redirect($PAGE->url);
if (isset($CFG->themerev)) {
// Store the themerev to restore after purging caches.
$themerev = $CFG->themerev;
}
// Cancel single plugin installation.
if ($abortinstall) {
// No sesskey support guaranteed here, because sessions might not work yet.
if ($confirmabortinstall) {
$pluginman->cancel_plugin_installation($abortinstall);
redirect($PAGE->url);
} else {
$continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
$abortable = $pluginman->get_plugin_info($abortinstall);
if ($pluginman->can_cancel_plugin_installation($abortable)) {
echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
die();
}
redirect($PAGE->url);
}
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
// We then purge the regular caches.
purge_all_caches();
if (isset($themerev)) {
// Restore the themerev.
set_config('themerev', $themerev);
}
// Cancel all plugins upgrades (that is, restore archived versions).
if ($abortupgradex) {
// No sesskey support guaranteed here, because sessions might not work yet.
$restorable = $pluginman->list_restorable_archives();
if ($restorable) {
upgrade_install_plugins($restorable, $confirmabortupgrade,
get_string('cancelupgradehead', 'core_plugin'),
new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
);
}
redirect($PAGE->url);
}
// Cancel single plugin upgrade (that is, install the archived version).
if ($abortupgrade) {
// No sesskey support guaranteed here, because sessions might not work yet.
$restorable = $pluginman->list_restorable_archives();
if (isset($restorable[$abortupgrade])) {
$restorable = array($restorable[$abortupgrade]);
upgrade_install_plugins($restorable, $confirmabortupgrade,
get_string('cancelupgradehead', 'core_plugin'),
new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
);
}
redirect($PAGE->url);
}
// Install all available missing dependencies.
if ($installdepx) {
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
upgrade_install_plugins($installable, $confirminstalldep,
get_string('dependencyinstallhead', 'core_plugin'),
new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
);
}
// Install single available missing dependency.
if ($installdep) {
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
if (!empty($installable[$installdep])) {
$installable = array($installable[$installdep]);
upgrade_install_plugins($installable, $confirminstalldep,
get_string('dependencyinstallhead', 'core_plugin'),
new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
);
}
}
// Install all available updates.
if ($installupdatex) {
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->available_updates());
upgrade_install_plugins($installable, $confirminstallupdate,
get_string('updateavailableinstallallhead', 'core_admin'),
new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
);
}
// Install single available update.
if ($installupdate and $installupdateversion) {
// No sesskey support guaranteed here, because sessions might not work yet.
if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
$installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
upgrade_install_plugins($installable, $confirminstallupdate,
get_string('updateavailableinstallallhead', 'core_admin'),
new moodle_url($PAGE->url, array('installupdate' => $installupdate,
'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
)
);
}
}
echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
$version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
die();
} else {
// Always verify plugin dependencies!
$failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
die();
}
unset($failed);
// Launch main upgrade.
upgrade_core($version, true);
}
} else if ($version < $CFG->version) {
// better stop here, we can not continue with plugin upgrades or anything else
throw new moodle_exception('downgradedcore', 'error', new moodle_url('/admin/'));
}
// Updated human-readable release version if necessary
if (!$cache and $release <> $CFG->release) { // Update the release version
set_config('release', $release);
}
if (!$cache and $branch <> $CFG->branch) { // Update the branch
set_config('branch', $branch);
}
if (!$cache and moodle_needs_upgrading()) {
$PAGE->set_url(new moodle_url($PAGE->url, array(
'confirmrelease' => $confirmrelease,
'confirmplugincheck' => $confirmplugins,
)));
check_upgrade_key($upgradekeyhash);
if (!$PAGE->headerprinted) {
// means core upgrade or installation was not already done
$pluginman = core_plugin_manager::instance();
$output = $PAGE->get_renderer('core', 'admin');
if (empty($confirmrelease)) {
require_once($CFG->libdir . '/environmentlib.php');
if (upgrade_stale_php_files_present()) {
$PAGE->set_title($stradministration);
$PAGE->set_cacheable(false);
echo $output->upgrade_stale_php_files_page();
die();
}
if (empty($confirmupgrade)) {
$a = new stdClass();
$a->oldversion = "$CFG->release (".sprintf('%.2f', $CFG->version).")";
$a->newversion = "$release (".sprintf('%.2f', $version).")";
$strdatabasechecking = get_string('databasechecking', '', $a);
$PAGE->set_title($stradministration);
$PAGE->set_heading($strdatabasechecking);
$PAGE->set_cacheable(false);
echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
die();
} else if (empty($confirmrelease)) {
require_once($CFG->libdir.'/environmentlib.php');
list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
$strcurrentrelease = get_string('currentrelease');
@@ -569,7 +384,7 @@ if (!$cache and moodle_needs_upgrading()) {
echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
die();
} else if (!$confirmplugins) {
} else if (empty($confirmplugins)) {
$strplugincheck = get_string('plugincheck');
$PAGE->navbar->add($strplugincheck);
@@ -577,9 +392,11 @@ if (!$cache and moodle_needs_upgrading()) {
$PAGE->set_heading($strplugincheck);
$PAGE->set_cacheable(false);
$pluginman = core_plugin_manager::instance();
// Check for available updates.
if ($fetchupdates) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$updateschecker = \core\update\checker::instance();
if ($updateschecker->enabled()) {
$updateschecker->fetch();
@@ -589,7 +406,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Cancel all plugin installations.
if ($abortinstallx) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$abortables = $pluginman->list_cancellable_installations();
if ($abortables) {
if ($confirmabortinstall) {
@@ -598,8 +415,7 @@ if (!$cache and moodle_needs_upgrading()) {
}
redirect($PAGE->url);
} else {
$continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
'confirmabortinstall' => 1));
$continue = new moodle_url($PAGE->url, ['abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1]);
echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
die();
}
@@ -609,7 +425,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Cancel single plugin installation.
if ($abortinstall) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
if ($confirmabortinstall) {
$pluginman->cancel_plugin_installation($abortinstall);
redirect($PAGE->url);
@@ -626,7 +442,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Cancel all plugins upgrades (that is, restore archived versions).
if ($abortupgradex) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$restorable = $pluginman->list_restorable_archives();
if ($restorable) {
upgrade_install_plugins($restorable, $confirmabortupgrade,
@@ -639,7 +455,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Cancel single plugin upgrade (that is, install the archived version).
if ($abortupgrade) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$restorable = $pluginman->list_restorable_archives();
if (isset($restorable[$abortupgrade])) {
$restorable = array($restorable[$abortupgrade]);
@@ -653,7 +469,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Install all available missing dependencies.
if ($installdepx) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
upgrade_install_plugins($installable, $confirminstalldep,
get_string('dependencyinstallhead', 'core_plugin'),
@@ -663,7 +479,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Install single available missing dependency.
if ($installdep) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
if (!empty($installable[$installdep])) {
$installable = array($installable[$installdep]);
@@ -676,7 +492,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Install all available updates.
if ($installupdatex) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
$installable = $pluginman->filter_installable($pluginman->available_updates());
upgrade_install_plugins($installable, $confirminstallupdate,
get_string('updateavailableinstallallhead', 'core_admin'),
@@ -686,7 +502,7 @@ if (!$cache and moodle_needs_upgrading()) {
// Install single available update.
if ($installupdate and $installupdateversion) {
require_sesskey();
// No sesskey support guaranteed here, because sessions might not work yet.
if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
$installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
upgrade_install_plugins($installable, $confirminstallupdate,
@@ -698,89 +514,280 @@ if (!$cache and moodle_needs_upgrading()) {
}
}
// Show plugins info.
echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
$version, $showallplugins,
new moodle_url($PAGE->url),
new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
$version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
die();
}
// Make sure plugin dependencies are always checked.
$failed = array();
if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
$output = $PAGE->get_renderer('core', 'admin');
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
die();
}
unset($failed);
}
// install/upgrade all plugins and other parts
upgrade_noncore(true);
}
// If this is the first install, indicate that this site is fully configured
// except the admin password
if (during_initial_install()) {
set_config('rolesactive', 1); // after this, during_initial_install will return false.
set_config('adminsetuppending', 1);
set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
// Apply default preset, if it is defined in $CFG and has a valid value.
if (!empty($CFG->setsitepresetduringinstall)) {
\core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
}
// we need this redirect to setup proper session
upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
}
// make sure admin user is created - this is the last step because we need
// session to be working properly in order to edit admin account
if (!empty($CFG->adminsetuppending)) {
$sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
if (!$sessionstarted) {
redirect("index.php?sessionstarted=1&lang=$CFG->lang");
} else {
$sessionverify = optional_param('sessionverify', 0, PARAM_BOOL);
if (!$sessionverify) {
$SESSION->sessionverify = 1;
redirect("index.php?sessionstarted=1&sessionverify=1&lang=$CFG->lang");
} else {
if (empty($SESSION->sessionverify)) {
throw new \moodle_exception('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
// Always verify plugin dependencies!
$failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
die();
}
unset($SESSION->sessionverify);
unset($failed);
// Launch main upgrade.
upgrade_core($version, true);
}
} else if ($version < $CFG->version) {
// Better stop here, we can not continue with plugin upgrades or anything else.
throw new moodle_exception('downgradedcore', 'error', new moodle_url('/admin/'));
}
// Cleanup SESSION to make sure other code does not complain in the future.
unset($SESSION->has_timed_out);
unset($SESSION->wantsurl);
// Updated human-readable release version if necessary.
if (!$cache && $release <> $CFG->release ) { // Update the release version.
set_config('release', $release);
}
// at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that
$adminids = explode(',', $CFG->siteadmins);
$adminuser = get_complete_user_data('id', reset($adminids));
if (!$cache && $branch <> $CFG->branch) { // Update the branch.
set_config('branch', $branch);
}
if ($adminuser->password === 'adminsetuppending') {
// prevent installation hijacking
if ($adminuser->lastip !== getremoteaddr()) {
throw new \moodle_exception('installhijacked', 'admin');
if (!$cache && moodle_needs_upgrading()) {
$PAGE->set_url(new moodle_url($PAGE->url, array(
'confirmrelease' => $confirmrelease,
'confirmplugincheck' => $confirmplugins,
)));
check_upgrade_key($upgradekeyhash);
if (!$PAGE->headerprinted) {
// Means core upgrade or installation was not already done.
$pluginman = core_plugin_manager::instance();
$output = $PAGE->get_renderer('core', 'admin');
if (empty($confirmrelease)) {
require_once($CFG->libdir . '/environmentlib.php');
list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
$strcurrentrelease = get_string('currentrelease');
$PAGE->navbar->add($strcurrentrelease);
$PAGE->set_title($strcurrentrelease);
$PAGE->set_heading($strcurrentrelease);
$PAGE->set_cacheable(false);
echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
die();
} else if (!$confirmplugins) {
$strplugincheck = get_string('plugincheck');
$PAGE->navbar->add($strplugincheck);
$PAGE->set_title($strplugincheck);
$PAGE->set_heading($strplugincheck);
$PAGE->set_cacheable(false);
// Check for available updates.
if ($fetchupdates) {
require_sesskey();
$updateschecker = \core\update\checker::instance();
if ($updateschecker->enabled()) {
$updateschecker->fetch();
}
redirect($PAGE->url);
}
// Cancel all plugin installations.
if ($abortinstallx) {
require_sesskey();
$abortables = $pluginman->list_cancellable_installations();
if ($abortables) {
if ($confirmabortinstall) {
foreach ($abortables as $plugin) {
$pluginman->cancel_plugin_installation($plugin->component);
}
redirect($PAGE->url);
} else {
$continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
'confirmabortinstall' => 1));
echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
die();
}
}
redirect($PAGE->url);
}
// Cancel single plugin installation.
if ($abortinstall) {
require_sesskey();
if ($confirmabortinstall) {
$pluginman->cancel_plugin_installation($abortinstall);
redirect($PAGE->url);
} else {
$continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
$abortable = $pluginman->get_plugin_info($abortinstall);
if ($pluginman->can_cancel_plugin_installation($abortable)) {
echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
die();
}
redirect($PAGE->url);
}
}
// Cancel all plugins upgrades (that is, restore archived versions).
if ($abortupgradex) {
require_sesskey();
$restorable = $pluginman->list_restorable_archives();
if ($restorable) {
upgrade_install_plugins($restorable, $confirmabortupgrade,
get_string('cancelupgradehead', 'core_plugin'),
new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
);
}
redirect($PAGE->url);
}
// Cancel single plugin upgrade (that is, install the archived version).
if ($abortupgrade) {
require_sesskey();
$restorable = $pluginman->list_restorable_archives();
if (isset($restorable[$abortupgrade])) {
$restorable = array($restorable[$abortupgrade]);
upgrade_install_plugins($restorable, $confirmabortupgrade,
get_string('cancelupgradehead', 'core_plugin'),
new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
);
}
redirect($PAGE->url);
}
// Install all available missing dependencies.
if ($installdepx) {
require_sesskey();
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
upgrade_install_plugins($installable, $confirminstalldep,
get_string('dependencyinstallhead', 'core_plugin'),
new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
);
}
// Install single available missing dependency.
if ($installdep) {
require_sesskey();
$installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
if (!empty($installable[$installdep])) {
$installable = array($installable[$installdep]);
upgrade_install_plugins($installable, $confirminstalldep,
get_string('dependencyinstallhead', 'core_plugin'),
new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
);
}
}
// Install all available updates.
if ($installupdatex) {
require_sesskey();
$installable = $pluginman->filter_installable($pluginman->available_updates());
upgrade_install_plugins($installable, $confirminstallupdate,
get_string('updateavailableinstallallhead', 'core_admin'),
new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
);
}
// Install single available update.
if ($installupdate && $installupdateversion) {
require_sesskey();
if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
$installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
upgrade_install_plugins($installable, $confirminstallupdate,
get_string('updateavailableinstallallhead', 'core_admin'),
new moodle_url($PAGE->url, array('installupdate' => $installupdate,
'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
)
);
}
}
// Show plugins info.
echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
$version, $showallplugins,
new moodle_url($PAGE->url),
new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
die();
}
// Make sure plugin dependencies are always checked.
$failed = array();
if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
$output = $PAGE->get_renderer('core', 'admin');
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
die();
}
unset($failed);
}
// Install/upgrade all plugins and other parts.
upgrade_noncore(true);
}
// If this is the first install, indicate that this site is fully configured,
// Except the admin password.
if (during_initial_install()) {
set_config('rolesactive', 1); // After this, during_initial_install will return false.
set_config('adminsetuppending', 1);
set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
// Apply default preset, if it is defined in $CFG and has a valid value.
if (!empty($CFG->setsitepresetduringinstall)) {
\core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
}
// We need this redirect to setup proper session.
upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
}
// Make sure admin user is created - this is the last step,
// We need session to be working properly in order to edit admin account.
if (!empty($CFG->adminsetuppending)) {
$sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
if (!$sessionstarted) {
redirect("index.php?sessionstarted=1&lang=$CFG->lang");
} else {
$sessionverify = optional_param('sessionverify', 0, PARAM_BOOL);
if (!$sessionverify) {
$SESSION->sessionverify = 1;
redirect("index.php?sessionstarted=1&sessionverify=1&lang=$CFG->lang");
} else {
if (empty($SESSION->sessionverify)) {
throw new \moodle_exception('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
}
unset($SESSION->sessionverify);
}
}
// Cleanup SESSION to make sure other code does not complain in the future.
unset($SESSION->has_timed_out);
unset($SESSION->wantsurl);
// At this stage there can be only one admin unless more were added by install,
// Users may change username, so do not rely on that.
$adminids = explode(',', $CFG->siteadmins);
$adminuser = get_complete_user_data('id', reset($adminids));
if ($adminuser->password === 'adminsetuppending') {
// Prevent installation hijacking.
if ($adminuser->lastip !== getremoteaddr()) {
throw new \moodle_exception('installhijacked', 'admin');
}
// Login user and let him set password and admin details.
$adminuser->newadminuser = 1;
complete_user_login($adminuser);
redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself.
} else {
unset_config('adminsetuppending');
}
// login user and let him set password and admin details
$adminuser->newadminuser = 1;
complete_user_login($adminuser);
redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
} else {
unset_config('adminsetuppending');
// Just make sure upgrade logging is properly terminated.
upgrade_finished('upgradesettings.php');
}
} else {
// just make sure upgrade logging is properly terminated
upgrade_finished('upgradesettings.php');
}
if (has_capability('moodle/site:config', context_system::instance())) {
+21 -28
View File
@@ -23,14 +23,11 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('NO_OUTPUT_BUFFERING', true);
require_once('../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once("{$CFG->libdir}/adminlib.php");
$action = required_param('action', PARAM_ALPHANUMEXT);
$media = required_param('media', PARAM_PLUGIN);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$action = required_param('action', PARAM_ALPHANUMEXT);
$plugin = required_param('plugin', PARAM_PLUGIN);
$PAGE->set_url('/admin/media.php');
$PAGE->set_context(context_system::instance());
@@ -38,42 +35,38 @@ $PAGE->set_context(context_system::instance());
require_admin();
require_sesskey();
$plugins = core_plugin_manager::instance()->get_plugins_of_type('media');
$sortorder = array_values(\core\plugininfo\media::get_enabled_plugins());
$return = new moodle_url('/admin/settings.php', array('section' => 'managemediaplayers'));
if (!array_key_exists($media, $plugins)) {
redirect($return);
}
$return = new moodle_url('/admin/settings.php', [
'section' => 'managemediaplayers',
]);
$displayname = get_string('pluginname', "media_{$plugin}");
switch ($action) {
case 'disable':
$class = \core_plugin_manager::resolve_plugininfo_class('media');
$class::enable_plugin($media, false);
if ($class::enable_plugin($plugin, false)) {
\core\notification::add(
get_string('plugin_disabled', 'core_admin', $displayname),
\core\notification::SUCCESS
);
}
break;
case 'enable':
$class = \core_plugin_manager::resolve_plugininfo_class('media');
$class::enable_plugin($media, true);
if ($class::enable_plugin($plugin, true)) {
\core\notification::add(
get_string('plugin_enabled', 'core_admin', $displayname),
\core\notification::SUCCESS
);
}
break;
case 'up':
if (($pos = array_search($media, $sortorder)) > 0) {
$tmp = $sortorder[$pos - 1];
$sortorder[$pos - 1] = $sortorder[$pos];
$sortorder[$pos] = $tmp;
\core\plugininfo\media::set_enabled_plugins($sortorder);
}
$class::change_plugin_order($plugin, $class::MOVE_UP);
break;
case 'down':
if ((($pos = array_search($media, $sortorder)) !== false) && ($pos < count($sortorder) - 1)) {
$tmp = $sortorder[$pos + 1];
$sortorder[$pos + 1] = $sortorder[$pos];
$sortorder[$pos] = $tmp;
\core\plugininfo\media::set_enabled_plugins($sortorder);
}
$class::change_plugin_order($plugin, $class::MOVE_DOWN);
break;
}
+10 -2
View File
@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir.'/adminlib.php');
include_once($CFG->dirroot.'/mnet/lib.php');
$sort = optional_param('sort', 'username', PARAM_ALPHA);
$sort = optional_param('sort', 'username', PARAM_ALPHAEXT);
$dir = optional_param('dir', 'ASC', PARAM_ALPHA);
$page = optional_param('page', 0, PARAM_INT);
$perpage = optional_param('perpage', 30, PARAM_INT);
@@ -153,7 +153,15 @@ foreach ($columns as $column) {
$headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
}
$headings['delete'] = '';
$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
$sortorder = get_safe_orderby([
'username' => 'username',
'mnet_host_id' => 'mnet_host_id',
'access' => 'accessctrl',
'default' => 'username',
], $sort, $dir, false);
$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
$aclcount = $DB->count_records('mnet_sso_access_control');
if (!$acl) {
+18 -3
View File
@@ -46,11 +46,23 @@
$formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
$formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
echo $OUTPUT->header();
echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
echo $OUTPUT->footer();
exit;
} else {
// We're deleting
// If no/cancel then redirect back to the network setting page.
if (!isset($form->confirm)) {
redirect(
new moodle_url('/admin/mnet/index.php'),
get_string('keydeletedcancelled', 'mnet'),
null,
\core\output\notification::NOTIFY_SUCCESS
);
}
if (!isset($SESSION->mnet_confirm_delete_key)) {
// fail - you're being attacked?
@@ -63,8 +75,12 @@
if($time < time() - 60) {
// fail - you're out of time.
throw new \moodle_exception ('deleteoutoftime', 'mnet', 'index.php');
exit;
redirect(
new moodle_url('/admin/mnet/index.php'),
get_string('deleteoutoftime', 'mnet'),
null,
\core\output\notification::NOTIFY_WARNING
);
}
if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
@@ -75,7 +91,6 @@
$mnet->replace_keys();
redirect('index.php', get_string('keydeleted','mnet'));
exit;
}
}
$hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
-2
View File
@@ -83,7 +83,6 @@ if ($formdata = $simpleform->get_data()) {
$mnet_peer->bootstrap($formdata->wwwroot, null, $application);
// bootstrap the second form straight with the data from the first form
$reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
$formdata->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
$reviewform->set_data($mnet_peer);
echo $OUTPUT->header();
echo $OUTPUT->box_start();
@@ -115,7 +114,6 @@ if (!empty($hostid)) {
}
$credentials = $mnet_peer->check_credentials($mnet_peer->public_key);
$reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
$mnet_peer->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
$reviewform->set_data((object)$mnet_peer);
echo $OUTPUT->box_start();
$reviewform->display();
+55 -139
View File
@@ -1,151 +1,67 @@
<?php
// Allows the admin to manage activity modules
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
require_once('../config.php');
require_once('../course/lib.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/tablelib.php');
/**
* A page to manage activity modules.
*
* @package core_admin
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// defines
define('MODULE_TABLE','module_administration_table');
require_once('../config.php');
require_once('../course/lib.php');
require_once("{$CFG->libdir}/adminlib.php");
require_once("{$CFG->libdir}/tablelib.php");
admin_externalpage_setup('managemodules');
define('MODULE_TABLE', 'module_administration_table');
$show = optional_param('show', '', PARAM_PLUGIN);
$hide = optional_param('hide', '', PARAM_PLUGIN);
admin_externalpage_setup('managemodules');
$plugin = optional_param('plugin', '', PARAM_PLUGIN);
$action = optional_param('action', '', PARAM_ALPHA);
/// Print headings
// If data submitted, then process and store.
if (!empty($action) && !empty($plugin) && confirm_sesskey()) {
$manager = \core_plugin_manager::resolve_plugininfo_class('mod');
$pluginname = get_string('pluginname', $plugin);
$stractivities = get_string("activities");
$struninstall = get_string('uninstallplugin', 'core_admin');
$strversion = get_string("version");
$strhide = get_string("hide");
$strshow = get_string("show");
$strsettings = get_string("settings");
$stractivities = get_string("activities");
$stractivitymodule = get_string("activitymodule");
$strshowmodulecourse = get_string('showmodulecourse');
if ($action === 'disable' && $manager::enable_plugin($plugin, 0)) {
\core\notification::add(
get_string('plugin_disabled', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
// Settings not required - only pages.
admin_get_root(true, false);
} else if ($action === 'enable' && $manager::enable_plugin($plugin, 1)) {
\core\notification::add(
get_string('plugin_enabled', 'core_admin', $pluginname),
\core\notification::SUCCESS
);
/// If data submitted, then process and store.
if (!empty($hide) and confirm_sesskey()) {
$class = \core_plugin_manager::resolve_plugininfo_class('mod');
$class::enable_plugin($hide, false);
admin_get_root(true, false); // settings not required - only pages
redirect(new moodle_url('/admin/modules.php'));
// Settings not required - only pages.
admin_get_root(true, false);
}
if (!empty($show) and confirm_sesskey()) {
$canenablemodule = true;
$modulename = $show;
// Redirect back to the modules page with out any params.
redirect(new moodle_url('/admin/modules.php'));
}
// Invoking a callback function that enables plugins to force additional actions (e.g. displaying notifications,
// modals, etc.) and also specify through its returned value (bool) whether the process of enabling the plugin
// should continue after these actions or not.
if (component_callback_exists("mod_{$modulename}", 'pre_enable_plugin_actions')) {
$canenablemodule = component_callback("mod_{$modulename}", 'pre_enable_plugin_actions');
}
if ($canenablemodule) {
$class = \core_plugin_manager::resolve_plugininfo_class('mod');
$class::enable_plugin($show, true);
admin_get_root(true, false); // Settings not required - only pages.
redirect(new moodle_url('/admin/modules.php'));
}
}
echo $OUTPUT->header();
echo $OUTPUT->heading($stractivities);
/// Get and sort the existing modules
if (!$modules = $DB->get_records('modules', array(), 'name ASC')) {
throw new \moodle_exception('moduledoesnotexist', 'error');
}
/// Print the table of all modules
// construct the flexible table ready to display
$table = new flexible_table(MODULE_TABLE);
$table->define_columns(array('name', 'instances', 'version', 'hideshow', 'uninstall', 'settings'));
$table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strsettings, $struninstall));
$table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
$table->set_attribute('id', 'modules');
$table->set_attribute('class', 'admintable generaltable');
$table->setup();
$pluginmanager = core_plugin_manager::instance();
foreach ($modules as $module) {
$plugininfo = $pluginmanager->get_plugin_info('mod_'.$module->name);
$status = $plugininfo->get_status();
if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
$strmodulename = '<span class="notifyproblem">'.$module->name.' ('.get_string('missingfromdisk').')</span>';
$missing = true;
} else {
// took out hspace="\10\", because it does not validate. don't know what to replace with.
$icon = "<img src=\"" . $OUTPUT->image_url('monologo', $module->name) . "\" class=\"icon\" alt=\"\" />";
$strmodulename = $icon.' '.get_string('modulename', $module->name);
$missing = false;
}
$uninstall = '';
if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('mod_'.$module->name, 'manage')) {
$uninstall = html_writer::link($uninstallurl, $struninstall);
}
if (file_exists("$CFG->dirroot/mod/$module->name/settings.php") ||
file_exists("$CFG->dirroot/mod/$module->name/settingstree.php")) {
$settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
} else {
$settings = "";
}
try {
$count = $DB->count_records_select($module->name, "course<>0");
} catch (dml_exception $e) {
$count = -1;
}
if ($count>0) {
$countlink = $OUTPUT->action_link(new moodle_url('/course/search.php', ['modulelist' => $module->name]),
$count, null, ['title' => $strshowmodulecourse]);
} else if ($count < 0) {
$countlink = get_string('error');
} else {
$countlink = "$count";
}
if ($missing) {
$visible = '';
$class = '';
} else if ($module->visible) {
$visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
$OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
$class = '';
} else {
$visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
$OUTPUT->pix_icon('t/show', $strshow) . '</a>';
$class = 'dimmed_text';
}
if ($module->name == "forum") {
$uninstall = "";
$visible = "";
$class = "";
}
$version = get_config('mod_'.$module->name, 'version');
$table->add_data(array(
$strmodulename,
$countlink,
$version,
$visible,
$settings,
$uninstall,
), $class);
}
$table->print_html();
echo $OUTPUT->footer();
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string("activities"));
$table = new \core_admin\table\activity_management_table();
$table->out();
echo $OUTPUT->footer();
+57
View File
@@ -0,0 +1,57 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MoodleNet callback.
*
* @package core
* @copyright 2023 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core\moodlenet\moodlenet_client;
use core\oauth2\api;
require_once(__DIR__ . '/../config.php');
require_login();
// Parameters.
$issuerid = required_param('issuerid', PARAM_INT);
$error = optional_param('error', '', PARAM_RAW);
$message = optional_param('error_description', null, PARAM_RAW);
// Headers to make it not cacheable.
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
$PAGE->set_context(context_system::instance());
$PAGE->set_url('/admin/moodlenet_oauth2_callback.php');
$PAGE->set_pagelayout('popup');
// Wait as long as it takes for this script to finish.
core_php_time_limit::raise();
$issuer = api::get_issuer($issuerid);
$returnurl = new moodle_url('/admin/moodlenet_oauth2_callback.php');
$returnurl->param('issuerid', $issuerid);
$returnurl->param('callback', 'yes');
$returnurl->param('sesskey', sesskey());
$oauthclient = api::get_user_oauth_client($issuer, $returnurl, moodlenet_client::API_SCOPE_CREATE_RESOURCE, true);
$oauthclient->is_logged_in(); // Will upgrade the auth code to a token.
echo $OUTPUT->header();
$PAGE->requires->js_call_amd('core/moodlenet/oauth2callback', 'init', [$error, $message]);
echo $OUTPUT->footer();
+23 -12
View File
@@ -30,25 +30,36 @@
require_once(__DIR__ . '/../config.php');
// The state parameter we've given (used in moodle as a redirect url).
// Per https://www.rfc-editor.org/rfc/rfc6749#section-4.1.2.1, state is required, even during error responses.
$state = required_param('state', PARAM_LOCALURL);
$redirecturl = new moodle_url($state);
$params = $redirecturl->params();
$error = optional_param('error', '', PARAM_RAW);
if ($error) {
$message = optional_param('error_description', '', PARAM_RAW);
if ($message) {
$SESSION->loginerrormsg = $message;
redirect(new moodle_url(get_login_url()));
} else {
$SESSION->loginerrormsg = $error;
redirect(new moodle_url(get_login_url()));
$message = optional_param('error_description', null, PARAM_RAW);
// Errors can occur for authenticated users, such as when a user denies authorization for some internal service call.
// In such cases, propagate the error to the component redirect URI.
if (isloggedin()) {
if (isset($params['sesskey']) && confirm_sesskey($params['sesskey'])) {
$redirecturl->param('error', $error);
if ($message) {
$redirecturl->param('error_description', $message);
}
redirect($redirecturl);
}
}
// Not logged in or the sesskey verification failed, redirect to login + show errors.
$SESSION->loginerrormsg = $message ?? $error;
redirect(new moodle_url(get_login_url()));
}
// The authorization code generated by the authorization server.
$code = required_param('code', PARAM_RAW);
// The state parameter we've given (used in moodle as a redirect url).
$state = required_param('state', PARAM_LOCALURL);
$redirecturl = new moodle_url($state);
$params = $redirecturl->params();
if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
$redirecturl->param('oauth2code', $code);
+4 -10
View File
@@ -190,8 +190,8 @@ class helper {
static::add_item($presetid, 'showdataretentionsummary', '0', 'tool_dataprivacy');
static::add_item($presetid, 'forum_maxattachments', '3');
static::add_item($presetid, 'guestloginbutton', '0');
// Set Activity chooser tabs to "Starred, All, Recommended".
static::add_item($presetid, 'activitychoosertabmode', '1');
// Set Activity chooser tabs to "Starred, Recommended, All".
static::add_item($presetid, 'activitychoosertabmode', '4');
// Modules: Hide chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
static::add_plugin($presetid, 'mod', 'chat', false);
@@ -278,9 +278,6 @@ class helper {
static::add_plugin($presetid, 'repository', 'url', false);
static::add_plugin($presetid, 'repository', 'wikimedia', false);
// Text editors: Disable TinyMCE HTML editor.
static::add_plugin($presetid, 'editor', 'tinymce', false);
// Create the "Full" site admin preset.
$data = [
'name' => get_string('fullpreset', 'core_adminpresets'),
@@ -301,8 +298,8 @@ class helper {
static::add_item($presetid, 'showdataretentionsummary', '1', 'tool_dataprivacy');
static::add_item($presetid, 'forum_maxattachments', '9');
static::add_item($presetid, 'guestloginbutton', '1');
// Set Activity chooser tabs to the default value ("Starred, All, Activities, Resources, Recommended").
static::add_item($presetid, 'activitychoosertabmode', '0');
// Set Activity chooser tabs to the default value ("Starred, Recommended, All, Activities, Resources").
static::add_item($presetid, 'activitychoosertabmode', '3');
// Modules: Enable chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
static::add_plugin($presetid, 'mod', 'chat', true);
@@ -383,8 +380,5 @@ class helper {
static::add_plugin($presetid, 'repository', 'local', true);
static::add_plugin($presetid, 'repository', 'url', true);
static::add_plugin($presetid, 'repository', 'wikimedia', true);
// Text editors: Enable TinyMCE HTML editor.
static::add_plugin($presetid, 'editor', 'tinymce', true);
}
}
@@ -16,6 +16,8 @@
namespace core_adminpresets\local\setting;
use admin_setting_configcheckbox;
/**
* Checkbox setting.
*
@@ -26,15 +28,15 @@ namespace core_adminpresets\local\setting;
*/
class adminpresets_admin_setting_configcheckbox extends adminpresets_setting {
protected function set_value($value) {
$this->value = clean_param($value, PARAM_BOOL);
$this->set_visiblevalue();
return true;
}
/**
* Sets the visible name for the setting selected value
*/
protected function set_visiblevalue() {
if ($this->value) {
/** @var admin_setting_configcheckbox $settingdata */
$settingdata = $this->get_settingdata();
// We need to compare the "yes" value of the inner checkbox, which isn't necessarily boolean.
if ($this->value == $settingdata->yes) {
$str = get_string('yes');
} else {
$str = get_string('no');
@@ -34,7 +34,7 @@ class adminpresets_admin_setting_configselect extends adminpresets_setting {
*/
protected function set_value($value) {
// When we intantiate the class we need the choices.
if (empty($this->settindata->choices) && method_exists($this->settingdata, 'load_choices')) {
if (empty($this->settingdata->choices) && method_exists($this->settingdata, 'load_choices')) {
$this->settingdata->load_choices();
}
@@ -68,6 +68,9 @@ class adminpresets_setting {
*/
protected $attributesvalues;
/** @var array To store the behaviors. */
protected array $behaviors = [];
/**
* Stores the setting data and the selected value
*
@@ -167,7 +170,7 @@ class adminpresets_setting {
/**
* Saves the setting attributes values
*
* @return array Array of inserted ids (in config_log)
* @return array|false Array of inserted ids (in config_log) or false if nothing was inserted
*/
public function save_attributes_values() {
// Plugin name or null.
@@ -206,8 +209,6 @@ class adminpresets_setting {
* @param bool $name Setting name to store.
* @param mixed $value Setting value to store.
* @return int|false config_log inserted id or false whenever the new value is the same as old value.
* @throws dml_exception
* @throws moodle_exception
*/
public function save_value($name = false, $value = null) {
// Object values if no arguments.
+11 -5
View File
@@ -105,7 +105,6 @@ class manager {
'adminpresets_auth_shibboleth_admin_setting_special_idp_configtextarea' => 'adminpresets_admin_setting_configtext',
'adminpresets_auth_shibboleth_admin_setting_special_wayf_select' => 'adminpresets_admin_setting_configselect',
'adminpresets_editor_atto_toolbar_setting' => 'adminpresets_admin_setting_configtext',
'adminpresets_editor_tinymce_json_setting_textarea' => 'adminpresets_admin_setting_configtext',
'adminpresets_enrol_database_admin_setting_category' => 'adminpresets_admin_setting_configselect',
'adminpresets_enrol_flatfile_role_setting' => 'adminpresets_admin_setting_configtext',
'adminpresets_enrol_ldap_admin_setting_category' => 'adminpresets_admin_setting_configselect',
@@ -184,7 +183,8 @@ class manager {
* @param boolean $sitedbvalues Indicates if $dbsettings comes from the site db or not
* @param array $settings Array format $array['plugin']['settingname'] = settings_types child class
* @param array|false $children Array of admin_category children or false
* @return array Array format $array['plugin']['settingname'] = settings_types child class
* @return \core_adminpresets\local\setting\adminpresets_setting[][] Array format
* $array['plugin']['settingname'] = adminpresets_setting child class
*/
public function get_settings(array $dbsettings, bool $sitedbvalues = false, array $settings = [], $children = false): array {
global $DB;
@@ -309,11 +309,17 @@ class manager {
$classname = null;
// Getting the appropiate class to get the correct setting value.
// Getting the appropriate class to get the correct setting value.
$settingtype = get_class($settingdata);
// Check if it is a setting from a plugin.
$plugindata = explode('_', $settingtype);
$namespacedata = explode('\\', $settingtype);
if (count($namespacedata) > 1) {
$plugindata = explode('_', $namespacedata[0]);
$settingtype = end($namespacedata);
} else {
$plugindata = explode('_', $settingtype, 2);
}
$types = \core_component::get_plugin_types();
if (array_key_exists($plugindata[0], $types)) {
$plugins = \core_component::get_plugin_list($plugindata[0]);
+1 -1
View File
@@ -99,7 +99,7 @@ class provider implements
/**
* Delete all data for all users in the specified context.
*
* @param context $context The specific context to delete data for.
* @param \context $context The specific context to delete data for.
*/
public static function delete_data_for_all_users_in_context(\context $context) {
// None of the the data from these tables should be deleted.
+2 -2
View File
@@ -133,8 +133,8 @@ class manager_test extends \advanced_testcase {
$settingpage = $adminroot->locate('modsettingquiz');
$settingdata = $settingpage->settings->quizbrowsersecurity;;
$result = $manager->get_setting($settingdata, '');
$this->assertInstanceOf('\mod_quiz\adminpresets\adminpresets_mod_quiz_admin_setting_browsersecurity', $result);
$this->assertNotEquals('core_adminpresets\local\setting\adminpresets_setting', get_class($result));
$this->assertInstanceOf(\mod_quiz\adminpresets\adminpresets_browser_security_setting::class, $result);
$this->assertNotEquals(\core_adminpresets\local\setting\adminpresets_setting::class, get_class($result));
// Check the adminpresets_setting class is returned when no specific class exists.
$settingpage = $adminroot->locate('managecustomfields');
+17 -29
View File
@@ -24,6 +24,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core_question\local\bank\question_version_status;
require_once(__DIR__ . '/../config.php');
require_once($CFG->libdir . '/questionlib.php');
@@ -42,36 +43,23 @@ $qtypes = question_bank::get_all_qtypes();
$pluginmanager = core_plugin_manager::instance();
// Get some data we will need - question counts and which types are needed.
$hiddenstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_HIDDEN;
$draftstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_DRAFT;
// The second JOIN on question_versions (qv2) is to get the latest version of each question. 
// (Using this sort of JOIN is a known trick for doing this in the fastest possible way.)
$counts = $DB->get_records_sql("
SELECT q.qtype,
COUNT(qv.id) AS numquestions,
SUM(CASE WHEN qv.status = :hiddenstatus THEN 1 ELSE 0 END) AS numhidden,
SUM(CASE WHEN qv.status = :draftstatus THEN 1 ELSE 0 END) AS numdraft
FROM {question} q
JOIN {question_versions} qv ON q.id = qv.questionid
LEFT JOIN {question_versions} qv2 ON qv.questionbankentryid = qv2.questionbankentryid AND qv.version < qv2.version
WHERE qv2.questionbankentryid IS NULL
GROUP BY q.qtype
", [
'hiddenstatus' => question_version_status::QUESTION_STATUS_HIDDEN,
'draftstatus' => question_version_status::QUESTION_STATUS_DRAFT,
]);
$sql = "SELECT result.qtype,
SUM(result.numquestions) AS numquestions,
SUM(result.numhidden) AS numhidden,
SUM(result.numdraft) AS numdraft
FROM (SELECT data.qtype,
data.versionid,
COUNT(data.numquestions) AS numquestions,
(SELECT COUNT(qv.id)
FROM {question_versions} qv
WHERE qv.id = data.versionid
AND qv.status = :hiddenstatus) AS numhidden,
(SELECT COUNT(qv.id)
FROM {question_versions} qv
WHERE qv.id = data.versionid
AND qv.status = :draftstatus) AS numdraft
FROM (SELECT q.qtype, qv.id AS versionid, 1 AS numquestions
FROM {question} q
JOIN {question_versions} qv ON qv.questionid = q.id
JOIN {question_bank_entries} qbe ON qbe.id = qv.questionbankentryid
AND qv.version = (SELECT MAX(v.version)
FROM {question_versions} v
JOIN {question_bank_entries} be ON be.id = v.questionbankentryid
WHERE be.id = qbe.id)) data
GROUP BY data.qtype, data.versionid) result
GROUP BY result.qtype";
$counts = $DB->get_records_sql($sql, ['hiddenstatus' => $hiddenstatus, 'draftstatus' => $draftstatus]);
$needed = [];
foreach ($qtypes as $qtypename => $qtype) {
if (!isset($counts[$qtypename])) {
+1 -1
View File
@@ -39,7 +39,7 @@ if ($publickey !== false) {
// Encrypt data.
$message = $CFG->release;
$success = openssl_public_encrypt(utf8_encode($message), $encrypteddata, $publickeystr);
$success = openssl_public_encrypt(\core_text::convert($message, 'ISO-8859-1', 'UTF-8'), $encrypteddata, $publickeystr);
if ($success) {
echo base64_encode($encrypteddata);
+1 -17
View File
@@ -213,7 +213,7 @@ class core_admin_renderer extends plugin_renderer_base {
$output .= $this->container_end();
}
$button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true);
$button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', single_button::BUTTON_PRIMARY);
$button->class = 'continuebutton';
$output .= $this->render($button);
$output .= $this->footer();
@@ -296,7 +296,6 @@ class core_admin_renderer extends plugin_renderer_base {
$output .= $this->header();
$output .= $this->output->heading(get_string('notifications', 'admin'));
$output .= $this->maturity_info($maturity);
$output .= $this->legacy_log_store_writing_error();
$output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
$output .= $this->insecure_dataroot_warning($insecuredataroot);
$output .= $this->development_libs_directories_warning($devlibdir);
@@ -2192,21 +2191,6 @@ class core_admin_renderer extends plugin_renderer_base {
return $output;
}
/**
* Check to see if writing to the deprecated legacy log store is enabled.
*
* @return string An error message if writing to the legacy log store is enabled.
*/
protected function legacy_log_store_writing_error() {
$enabled = get_config('logstore_legacy', 'loglegacy');
$plugins = explode(',', get_config('tool_log', 'enabled_stores'));
$enabled = $enabled && in_array('logstore_legacy', $plugins);
if ($enabled) {
return $this->warning(get_string('legacylogginginuse'));
}
}
/**
* Display message about the benefits of registering on Moodle.org
*
+43 -20
View File
@@ -25,8 +25,10 @@
require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir.'/adminlib.php');
$confirmadd = optional_param('confirmadd', 0, PARAM_INT);
$confirmdel = optional_param('confirmdel', 0, PARAM_INT);
$addusersaction = optional_param('add', false, PARAM_BOOL);
$addusers = optional_param('addusers', '', PARAM_SEQUENCE);
$removeusersaction = optional_param('remove', false, PARAM_BOOL);
$removeusers = optional_param('removeusers', '', PARAM_SEQUENCE);
$PAGE->set_url('/admin/roles/admins.php');
@@ -38,33 +40,47 @@ if (!is_siteadmin()) {
$admisselector = new core_role_admins_existing_selector();
$potentialadmisselector = new core_role_admins_potential_selector();
if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
if ($addusersaction) {
if ($userstoadd = $potentialadmisselector->get_selected_users()) {
$user = reset($userstoadd);
$username = $potentialadmisselector->output_user($user);
$usernames = array_map(static function(stdClass $user) use ($potentialadmisselector): string {
return $potentialadmisselector->output_user($user);
}, $userstoadd);
$userids = implode(',', array_keys($usernames));
echo $OUTPUT->header();
$yesurl = new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey()));
echo $OUTPUT->confirm(get_string('confirmaddadmin', 'core_role', $username), $yesurl, $PAGE->url);
echo $OUTPUT->confirm(get_string('confirmaddadmins', 'core_role') . html_writer::alist($usernames),
new moodle_url('/admin/roles/admins.php', ['addusers' => $userids, 'sesskey' => sesskey()]), $PAGE->url);
echo $OUTPUT->footer();
die;
}
} else if (optional_param('remove', false, PARAM_BOOL) and confirm_sesskey()) {
} else if ($removeusersaction) {
if ($userstoremove = $admisselector->get_selected_users()) {
$user = reset($userstoremove);
if ($USER->id == $user->id) {
// Can not remove self.
} else {
$username = $admisselector->output_user($user);
// Can not remove self.
$userstoremove = array_filter($userstoremove, static function(int $userid): bool {
global $USER;
return $userid != $USER->id;
}, ARRAY_FILTER_USE_KEY);
if ($userstoremove) {
$usernames = array_map(static function(stdClass $user) use ($admisselector): string {
return $admisselector->output_user($user);
}, $userstoremove);
$userids = implode(',', array_keys($usernames));
echo $OUTPUT->header();
$yesurl = new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey()));
echo $OUTPUT->confirm(get_string('confirmdeladmin', 'core_role', $username), $yesurl, $PAGE->url);
echo $OUTPUT->confirm(get_string('confirmremoveadmins', 'core_role') . html_writer::alist($usernames),
new moodle_url('/admin/roles/admins.php', ['removeusers' => $userids, 'sesskey' => sesskey()]), $PAGE->url);
echo $OUTPUT->footer();
die;
}
}
} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
} else if (optional_param('main', false, PARAM_BOOL) && confirm_sesskey()) {
// Setting main administrator will choose the first selected user in the case of multiple selections.
if ($newmain = $admisselector->get_selected_users()) {
$newmain = reset($newmain);
$newmain = $newmain->id;
@@ -91,7 +107,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
}
}
} else if ($confirmadd and confirm_sesskey()) {
} else if ($addusers && confirm_sesskey()) {
$admins = array();
foreach (explode(',', $CFG->siteadmins) as $admin) {
$admin = (int)$admin;
@@ -102,7 +118,9 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
$logstringold = implode(', ', $admins);
$admins[$confirmadd] = $confirmadd;
foreach (explode(',', $addusers) as $userid) {
$admins[$userid] = $userid;
}
$logstringnew = implode(', ', $admins);
@@ -111,7 +129,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
redirect($PAGE->url);
} else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
} else if ($removeusers && confirm_sesskey()) {
$admins = array();
foreach (explode(',', $CFG->siteadmins) as $admin) {
$admin = (int)$admin;
@@ -122,7 +140,12 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
$logstringold = implode(', ', $admins);
unset($admins[$confirmdel]);
// Can not remove self.
foreach (explode(',', $removeusers) as $userid) {
if ($userid != $USER->id) {
unset($admins[$userid]);
}
}
$logstringnew = implode(', ', $admins);
@@ -37,7 +37,6 @@ class core_role_admins_existing_selector extends user_selector_base {
if (is_null($name)) {
$name = 'removeselect';
}
$options['multiselect'] = false;
$options['includecustomfields'] = true;
parent::__construct($name, $options);
}
@@ -38,7 +38,6 @@ class core_role_admins_potential_selector extends user_selector_base {
if (is_null($name)) {
$name = 'addselect';
}
$options['multiselect'] = false;
$options['includecustomfields'] = true;
$options['exclude'] = explode(',', $CFG->siteadmins);
parent::__construct($name, $options);
+2 -3
View File
@@ -54,10 +54,9 @@ class core_role_allow_view_page extends core_role_allow_role_page {
/**
* Get tool tip for cell.
* @param string $fromrole
* @param string $targetrole
* @param stdClass $fromrole
* @param stdClass $targetrole
* @return string
* @throws \coding_exception
*/
protected function get_cell_tooltip($fromrole, $targetrole) {
$a = new stdClass;
@@ -533,7 +533,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
protected function get_description_field($id) {
return '<textarea class="form-textarea form-control" id="'. s($id) .'" name="description" rows="10" cols="50">' .
htmlspecialchars($this->role->description) .
htmlspecialchars($this->role->description, ENT_COMPAT) .
'</textarea>';
}
+13 -5
View File
@@ -80,8 +80,15 @@ class core_role_preset {
$top->appendChild($contextlevels);
foreach (get_role_contextlevels($roleid) as $level) {
$name = context_helper::get_class_for_level($level);
$name = preg_replace('/^context_/', '', $name);
$contextlevels->appendChild($dom->createElement('level', $name));
if (strpos($name, 'core\\context\\') === 0) {
// Use short names of standard contexts for backwards compatibility.
$value = preg_replace('/^core\\\\context\\\\/', '', $name);
} else {
// Must be a custom plugin level, use numbers to work around
// potential duplicate short names of contexts in add-ons.
$value = $level;
}
$contextlevels->appendChild($dom->createElement('level', $value));
}
foreach (array('assign', 'override', 'switch', 'view') as $type) {
@@ -197,9 +204,10 @@ class core_role_preset {
$info['contextlevels'] = array();
$levelmap = array_flip(context_helper::get_all_levels());
foreach ($values as $value) {
$level = 'context_'.$value;
if (isset($levelmap[$level])) {
$cl = $levelmap[$level];
// Numbers and short names are supported since Moodle 4.2.
$classname = \core\context_helper::parse_external_level($value);
if ($classname) {
$cl = $classname::LEVEL;
$info['contextlevels'][$cl] = $cl;
}
}
+1
View File
@@ -90,6 +90,7 @@ $title = get_string('overridepermissionsforrole', 'core_role', $a);
$currenttab = 'permissions';
$PAGE->set_title($title);
$PAGE->activityheader->disable();
$PAGE->navbar->add($straction);
switch ($context->contextlevel) {
case CONTEXT_SYSTEM:
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<role>
<shortname>courseviewer</shortname>
<name/>
<description/>
<archetype/>
<contextlevels>
<level>system</level>
<level>40</level>
<level>50</level>
</contextlevels>
<allowassign/>
<allowoverride/>
<allowswitch/>
<allowview>
<shortname>student</shortname>
</allowview>
<permissions>
<allow>moodle/category:viewhiddencategories</allow>
<allow>moodle/course:ignoreavailabilityrestrictions</allow>
<allow>moodle/course:viewhiddencourses</allow>
<allow>moodle/site:configview</allow>
</permissions>
</role>
+16
View File
@@ -76,4 +76,20 @@ class preset_test extends \advanced_testcase {
}
}
}
/**
* Tests covered method.
* @covers \core_role_preset::parse_preset
*/
public function test_mixed_levels() {
// The problem here is that we cannot guarantee plugin contexts
// have unique short names, so we have to also support level numbers.
$xml = file_get_contents(__DIR__ . '/fixtures/mixed_levels.xml');
$this->assertTrue(\core_role_preset::is_valid_preset($xml));
$preset = \core_role_preset::parse_preset($xml);
$expected = [\core\context\system::LEVEL, \core\context\coursecat::LEVEL, \core\context\course::LEVEL];
$expected = array_combine($expected, $expected);
$this->assertSame($expected, $preset['contextlevels']);
}
}
+5 -1
View File
@@ -53,6 +53,7 @@ class provider_test extends provider_testcase {
$showadvanced = 1;
set_user_preference('definerole_showadvanced', $showadvanced);
provider::export_user_preferences($user->id);
/** @var \core_privacy\tests\request\content_writer $writer */
$writer = writer::with_context(\context_system::instance());
$prefs = $writer->get_user_preferences('core_role');
$this->assertEquals(transform::yesno($showadvanced), transform::yesno($prefs->definerole_showadvanced->value));
@@ -184,10 +185,11 @@ class provider_test extends provider_testcase {
// Retrieve role capabilities and role assignments.
provider::export_user_data($approvedcontextlist);
foreach ($contextlist as $context) {
/** @var \core_privacy\tests\request\content_writer $writer */
$writer = writer::with_context($context);
$this->assertTrue($writer->has_any_data());
if ($context->contextlevel == CONTEXT_MODULE) {
if ($data = $writer->get_data($subcontextstudent)) {
if ($data = (array)$writer->get_data($subcontextstudent)) {
$this->assertEquals($user->id, reset($data)->userid);
}
if ($data = (array)$writer->get_data($subcontextrc)) {
@@ -413,6 +415,7 @@ class provider_test extends provider_testcase {
];
// Test User is assigned role teacher to cohort.
provider::export_user_role_to_cohort($user->id);
/** @var \core_privacy\tests\request\content_writer $writer */
$writer = writer::with_context($contextuserassignover);
$this->assertTrue($writer->has_any_data());
$exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
@@ -430,6 +433,7 @@ class provider_test extends provider_testcase {
api::create_cohort_role_assignment($params);
api::sync_all_cohort_roles();
provider::export_user_role_to_cohort($user->id);
/** @var \core_privacy\tests\request\content_writer $writer */
$writer = writer::with_context($contextuser);
$this->assertTrue($writer->has_any_data());
$exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
+1 -1
View File
@@ -77,7 +77,7 @@ if ($action) {
$cancelurl = new moodle_url('/admin/searchareas.php');
echo $OUTPUT->header();
echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a),
new single_button($actionurl, get_string('continue'), 'post', true),
new single_button($actionurl, get_string('continue'), 'post', single_button::BUTTON_PRIMARY),
new single_button($cancelurl, get_string('cancel'), 'get'));
echo $OUTPUT->footer();
exit;
+1 -1
View File
@@ -83,7 +83,7 @@ if (optional_param('sesskey', '', PARAM_ALPHANUM)) {
// Display confirmation prompt.
echo $OUTPUT->confirm(get_string('gradualreindex_confirm', 'search', html_writer::tag('strong', $areaname)),
new single_button(new moodle_url('/admin/searchreindex.php', ['areaid' => $areaid,
'sesskey' => sesskey()]), get_string('continue'), 'post', true),
'sesskey' => sesskey()]), get_string('continue'), 'post', single_button::BUTTON_PRIMARY),
new single_button(new moodle_url('/admin/searchareas.php'), get_string('cancel'), 'get'));
}
+7 -1
View File
@@ -257,6 +257,13 @@ reports,core_reportbuilder|/reportbuilder/index.php',
$ltemp += get_string_manager()->get_list_of_translations(true);
$temp->add(new admin_setting_configselect('doclang', get_string('doclang', 'admin'), get_string('configdoclang', 'admin'), '', $ltemp));
$temp->add(new admin_setting_configcheckbox('doctonewwindow', new lang_string('doctonewwindow', 'admin'), new lang_string('configdoctonewwindow', 'admin'), 0));
$temp->add(new admin_setting_configtext(
'coursecreationguide',
new lang_string('coursecreationguide', 'admin'),
new lang_string('coursecreationguide_help', 'admin'),
'https://moodle.academy/coursequickstart',
PARAM_URL
));
$ADMIN->add('appearance', $temp);
if (!empty($CFG->enabledashboard)) {
@@ -294,7 +301,6 @@ reports,core_reportbuilder|/reportbuilder/index.php',
$ADMIN->add('appearance', $temp);
$temp = new admin_settingpage('ajax', new lang_string('ajaxuse'));
$temp->add(new admin_setting_configcheckbox('useexternalyui', new lang_string('useexternalyui', 'admin'), new lang_string('configuseexternalyui', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('yuicomboloading', new lang_string('yuicomboloading', 'admin'), new lang_string('configyuicomboloading', 'admin'), 1));
$setting = new admin_setting_configcheckbox('cachejs', new lang_string('cachejs', 'admin'), new lang_string('cachejs_help', 'admin'), 1);
$setting->set_updatedcallback('js_reset_all_caches');
+38 -2
View File
@@ -22,6 +22,10 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/pdflib.php');
use core_admin\local\settings\filesize;
$capabilities = array(
@@ -174,6 +178,19 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$temp->add(new admin_setting_configselect('moodlecourse/maxbytes', new lang_string('maximumupload'),
new lang_string('coursehelpmaximumupload'), key($choices), $choices));
if (!empty($CFG->enablepdfexportfont)) {
$pdf = new \pdf;
$fontlist = $pdf->get_export_fontlist();
// Show the option if the font is defined more than one.
if (count($fontlist) > 1) {
$temp->add(new admin_setting_configselect('moodlecourse/pdfexportfont',
new lang_string('pdfexportfont', 'course'),
new lang_string('pdfexportfont_help', 'course'),
'freesans', $fontlist
));
}
}
// Completion tracking.
$temp->add(new admin_setting_heading('progress', new lang_string('completion','completion'), ''));
$temp->add(new admin_setting_configselect('moodlecourse/enablecompletion', new lang_string('completion', 'completion'),
@@ -243,8 +260,11 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
'activitychoosertabmode',
new lang_string('activitychoosertabmode', 'course'),
new lang_string('activitychoosertabmode_desc', 'course'),
0,
3,
[
3 => new lang_string('activitychoosertabmodefour', 'course'),
4 => new lang_string('activitychoosertabmodefive', 'course'),
5 => new lang_string('activitychoosertabmodesix', 'course'),
0 => new lang_string('activitychoosertabmodeone', 'course'),
1 => new lang_string('activitychoosertabmodetwo', 'course'),
2 => new lang_string('activitychoosertabmodethree', 'course'),
@@ -337,6 +357,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
new lang_string('configgeneralcontentbankcontent', 'backup'),
['value' => 1, 'locked' => 0])
);
$temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_xapistate',
new lang_string('generalxapistate', 'backup'),
new lang_string('configgeneralxapistate', 'backup'),
['value' => 1, 'locked' => 0])
);
$temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_legacyfiles',
new lang_string('generallegacyfiles', 'backup'),
@@ -477,7 +503,8 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities', 'backup'),
new lang_string('backupautoactivitiesdescription', 'backup'), 1));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
$temp->add(new admin_setting_configcheckbox(
'backup/backup_auto_files',
@@ -500,6 +527,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
new lang_string('configgeneralcontentbankcontent', 'backup'),
1)
);
$temp->add(new admin_setting_configcheckbox(
'backup/backup_auto_xapistate',
new lang_string('generalxapistate', 'backup'),
new lang_string('configgeneralxapistate', 'backup'),
1)
);
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_legacyfiles',
new lang_string('generallegacyfiles', 'backup'),
@@ -570,6 +603,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
new lang_string('generalcontentbankcontent', 'backup'),
new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));
$temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_xapistate',
new lang_string('generalxapistate', 'backup'),
new lang_string('configrestorexapistate', 'backup'), array('value' => 1, 'locked' => 0)));
$temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_legacyfiles',
new lang_string('generallegacyfiles', 'backup'),
new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));
+6
View File
@@ -33,6 +33,11 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
new lang_string('enablecourserelativedates', 'core_admin'),
new lang_string('enablecourserelativedates_desc', 'core_admin'), 0));
// Sharing to MoodleNet setting.
$temp->add(new admin_setting_configcheckbox('enablesharingtomoodlenet',
new lang_string('enablesharingtomoodlenet', 'core_admin'),
new lang_string('enablesharingtomoodlenet_desc', 'core_admin'), 0));
$ADMIN->add('experimental', $temp);
// "debugging" settingpage
@@ -51,6 +56,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
100 => new lang_string('debugsqltrace100', 'admin'))));
$temp->add(new admin_setting_configcheckbox('debugvalidators', new lang_string('debugvalidators', 'admin'), new lang_string('configdebugvalidators', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('debugpageinfo', new lang_string('debugpageinfo', 'admin'), new lang_string('configdebugpageinfo', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('debugtemplateinfo', new lang_string('debugtemplateinfo', 'admin'), new lang_string('debugtemplateinfo_desc', 'admin'), 0));
$ADMIN->add('development', $temp);
// "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).
+2
View File
@@ -18,6 +18,8 @@ if ($hassiteconfig) {
$temp->add(new admin_setting_configcheckbox('langstringcache', new lang_string('langstringcache', 'admin'), new lang_string('configlangstringcache', 'admin'), 1));
$temp->add(new admin_setting_configtext('locale', new lang_string('localetext', 'admin'), new lang_string('configlocale', 'admin'), '', PARAM_FILE));
$temp->add(new admin_setting_configselect('latinexcelexport', new lang_string('latinexcelexport', 'admin'), new lang_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
$temp->add(new admin_setting_configcheckbox('enablepdfexportfont', new lang_string('enablepdfexportfont', 'admin'),
new lang_string('enablepdfexportfont_desc', 'admin'), 0));
$temp->add(new setting_scheduled_task_status('langimporttaskstatus', '\tool_langimport\task\update_langpacks_task'));
$ADMIN->add('language', $temp);
+55
View File
@@ -0,0 +1,55 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* This file gives information about MoodleNet.
*
* @package core
* @copyright 2023 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die;
if ($hassiteconfig) {
if (!empty($CFG->enablesharingtomoodlenet)) {
if (!$ADMIN->locate('moodlenet')) {
$ADMIN->add('root', new admin_category('moodlenet', get_string('pluginname', 'tool_moodlenet')));
}
// Outbound settings page.
$settings = new admin_settingpage('moodlenetoutbound', new lang_string('moodlenet:outboundsettings', 'moodle'));
$ADMIN->add('moodlenet', $settings);
// Get all the issuers.
$issuers = \core\oauth2\api::get_all_issuers();
$oauth2services = [
'' => new lang_string('none', 'admin'),
];
foreach ($issuers as $issuer) {
// Get the enabled issuer with the service type is MoodleNet only.
if ($issuer->get('servicetype') == 'moodlenet' && $issuer->get('enabled')) {
$oauth2services[$issuer->get('id')] = s($issuer->get('name'));
}
}
$url = new \moodle_url('/admin/tool/oauth2/issuers.php');
$settings->add(new admin_setting_configselect('moodlenet/oauthservice', new lang_string('issuer', 'auth_oauth2'),
new lang_string('moodlenet:configoauthservice', 'moodle', $url->out()), '', $oauth2services));
}
}
+21 -5
View File
@@ -101,7 +101,7 @@ if ($hassiteconfig) {
new lang_string('limitconcurrentlogins', 'core_auth'),
new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
$temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url(), ENT_COMPAT)), ''));
$temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
$temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),
@@ -154,7 +154,12 @@ if ($hassiteconfig) {
/// Editor plugins
$ADMIN->add('modules', new admin_category('editorsettings', new lang_string('editors', 'editor')));
$temp = new admin_settingpage('manageeditors', new lang_string('editorsettings', 'editor'));
$temp->add(new admin_setting_manageeditors());
$temp->add(new \core_admin\admin\admin_setting_plugin_manager(
'editor',
\core_admin\table\editor_management_table::class,
'editorsui',
get_string('editorsettings', 'editor'),
));
$ADMIN->add('editorsettings', $temp);
$plugins = core_plugin_manager::instance()->get_plugins_of_type('editor');
core_collator::asort_objects_by_property($plugins, 'displayname');
@@ -273,7 +278,12 @@ if ($hassiteconfig) {
$temp = new admin_settingpage('managemediaplayers', new lang_string('managemediaplayers', 'media'));
$temp->add(new admin_setting_heading('mediaformats', get_string('mediaformats', 'core_media'),
format_text(get_string('mediaformats_desc', 'core_media'), FORMAT_MARKDOWN)));
$temp->add(new admin_setting_managemediaplayers());
$temp->add(new \core_admin\admin\admin_setting_plugin_manager(
'media',
\core_admin\table\media_management_table::class,
'managemediaplayers',
new lang_string('managemediaplayers', 'core_media'),
));
$temp->add(new admin_setting_heading('managemediaplayerscommonheading', new lang_string('commonsettings', 'admin'), ''));
$temp->add(new admin_setting_configtext('media_default_width',
new lang_string('defaultwidth', 'core_media'), new lang_string('defaultwidthdesc', 'core_media'),
@@ -723,8 +733,14 @@ if ($hassiteconfig) {
/// Add all admin tools
if ($hassiteconfig) {
$ADMIN->add('modules', new admin_category('tools', new lang_string('tools', 'admin')));
$ADMIN->add('tools', new admin_externalpage('managetools', new lang_string('toolsmanage', 'admin'),
$CFG->wwwroot . '/' . $CFG->admin . '/tools.php'));
$settingspage = new admin_settingpage('toolsmanagement', new lang_string('toolsmanage', 'admin'));
$ADMIN->add('tools', $settingspage);
$settingspage->add(new \core_admin\admin\admin_setting_plugin_manager(
'tool',
\core_admin\table\tool_plugin_management_table::class,
'managetools',
new lang_string('toolsmanage', 'admin')
));
}
// Now add various admin tools.
+1 -1
View File
@@ -169,7 +169,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
// Settings elements used by the \core\files\curl_security_helper class.
$blockedhostsdefault = [
'127.0.0.1',
'127.0.0.0/8',
'192.168.0.0/16',
'10.0.0.0/8',
'172.16.0.0/12',
+24 -1
View File
@@ -69,7 +69,8 @@ if ($hassiteconfig) {
CONTACT_SUPPORT_DISABLED => new lang_string('disabled', 'admin'),
]
));
$temp->add(new admin_setting_configtext('servicespage', new lang_string('servicespage', 'admin'),
new lang_string('configservicespage', 'admin'), '', PARAM_URL));
$ADMIN->add('server', $temp);
@@ -263,6 +264,14 @@ if ($hassiteconfig) {
]
));
$temp->add(new admin_setting_configduration(
'xapicleanupperiod',
new lang_string('xapicleanupperiod', 'xapi'),
new lang_string('xapicleanupperiod_help', 'xapi'),
WEEKSECS * 8,
WEEKSECS
));
$ADMIN->add('server', $temp);
$temp->add(new admin_setting_configduration('filescleanupperiod',
@@ -330,6 +339,20 @@ if ($hassiteconfig) {
$setting->set_updatedcallback('theme_reset_static_caches');
$temp->add($setting);
$setting = new admin_setting_configduration(
'cron_keepalive',
new lang_string('cron_keepalive', 'admin'),
new lang_string('cron_keepalive_desc', 'admin'),
\core\cron::DEFAULT_MAIN_PROCESS_KEEPALIVE,
// The default unit is minutes.
MINSECS,
);
// Set an upper limit.
$setting->set_max_duration(\core\cron::MAX_MAIN_PROCESS_KEEPALIVE);
$temp->add($setting);
$temp->add(
new admin_setting_configtext(
'task_scheduled_concurrency_limit',
+9 -1
View File
@@ -101,7 +101,15 @@ if ($hassiteconfig
$ADMIN->add('accounts', new admin_externalpage('profilefields', new lang_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));
$ADMIN->add('accounts', new admin_externalpage('cohorts', new lang_string('cohorts', 'cohort'), $CFG->wwwroot . '/cohort/index.php', array('moodle/cohort:manage', 'moodle/cohort:view')));
$ADMIN->add(
'accounts',
new admin_externalpage(
'cohort_customfield',
new lang_string('cohort_customfield', 'admin'),
$CFG->wwwroot . '/cohort/customfield.php',
['moodle/cohort:configurecustomfields']
)
);
// Stuff under the "roles" subcategory.
+1 -1
View File
@@ -60,7 +60,7 @@ $report = system_report_factory::create(task_logs::class, context_system::instan
if (!empty($filter)) {
$report->set_filter_values([
'task_log:name_values' => $filter,
'task_log:name_values' => trim($filter, '\\'),
]);
}
@@ -51,12 +51,13 @@
<div class="form-password">
<span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
<span data-passwordunmask="editor">
<input type="hidden"
<input type="password"
autocomplete="new-password"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
data-size="{{ size }}"
class="form-control d-inline-block"
class="form-control d-none"
>
</span>
<a href="#" data-passwordunmask="edit" title="{{ edithint }}">
@@ -15,7 +15,7 @@
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template core_admin/admin_setting_encryptedpassword
@template core_admin/setting_encryptedpassword
Admin encrypted password template.
+3 -3
View File
@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
When I navigate to "Users > Accounts > Browse list of users" in site administration
# Name field always present, email field is default for showidentity.
Then the following should exist in the "users" table:
| First name / Surname | Email address |
| First name / Last name | Email address |
| User One | one@example.com |
| User Two | two@example.com |
# Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
| alternativefullnameformat | firstnamephonetic lastname |
When I navigate to "Users > Accounts > Browse list of users" in site administration
Then the following should exist in the "users" table:
| First name - phonetic / Surname | Email address |
| First name - phonetic / Last name | Email address |
| Yewzer One | one@example.com |
| Yoozare Two | two@example.com |
@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
| showuseridentity | department,profile_field_frog |
When I navigate to "Users > Accounts > Browse list of users" in site administration
Then the following should exist in the "users" table:
| First name / Surname | Favourite frog | Department |
| First name / Last name | Favourite frog | Department |
| User One | Kermit | Attack |
| User Two | Tree | Defence |
And I should not see "Email address" in the "table" "css_element"
@@ -15,7 +15,7 @@ Feature: Allowing multiple accounts to have the same email address
And I set the following fields to these values:
| Username | s2 |
| First name | Jane |
| Surname | Doe |
| Last name | Doe |
| Email address | <email> |
| New password | test |
And I press "Create user"
@@ -35,9 +35,7 @@ Feature: Allowing multiple accounts to have the same email address
| username | firstname | lastname | email |
| s1 | John | Doe | s1@example.com |
| s2 | Jane | Doe | s2@example.com |
When I log in as "admin"
And I navigate to "Users > Accounts > Browse list of users" in site administration
And I click on "Edit" "link" in the "Jane Doe" "table_row"
When I am on the "s2" "user > editing" page logged in as "admin"
And I set the field "Email address" to "<email>"
And I press "Update profile"
Then I should <expect> "This email address is already registered."
@@ -8,7 +8,7 @@ Feature: An administrator can configure the available user list filters
When I log in as "admin"
And I navigate to "Users > Accounts > Browse list of users" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should not see "Username" in the "New filter" "fieldset"
And I should not see "Email address" in the "New filter" "fieldset"
@@ -30,7 +30,7 @@ Feature: An administrator can configure the available user list filters
And I should not see "MNet ID provider" in the "New filter" "fieldset"
And I navigate to "Users > Accounts > Bulk user actions" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should not see "Username" in the "New filter" "fieldset"
And I should not see "Email address" in the "New filter" "fieldset"
@@ -57,7 +57,7 @@ Feature: An administrator can configure the available user list filters
And I log in as "admin"
And I navigate to "Users > Accounts > Browse list of users" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should see "Username" in the "New filter" "fieldset"
And I should see "Email address" in the "New filter" "fieldset"
@@ -79,7 +79,7 @@ Feature: An administrator can configure the available user list filters
And I should not see "MNet ID provider" in the "New filter" "fieldset"
And I navigate to "Users > Accounts > Bulk user actions" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should see "Username" in the "New filter" "fieldset"
And I should see "Email address" in the "New filter" "fieldset"
@@ -106,7 +106,7 @@ Feature: An administrator can configure the available user list filters
And I log in as "admin"
And I navigate to "Users > Accounts > Browse list of users" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should not see "Username" in the "New filter" "fieldset"
And I should not see "Email address" in the "New filter" "fieldset"
@@ -128,7 +128,7 @@ Feature: An administrator can configure the available user list filters
And I should not see "MNet ID provider" in the "New filter" "fieldset"
And I navigate to "Users > Accounts > Bulk user actions" in site administration
Then I should see "User full name"
And I should not see "Surname" in the "New filter" "fieldset"
And I should not see "Last name" in the "New filter" "fieldset"
And I should not see "Firstname" in the "New filter" "fieldset"
And I should not see "Username" in the "New filter" "fieldset"
And I should not see "Email address" in the "New filter" "fieldset"
+59
View File
@@ -0,0 +1,59 @@
@core @core_admin
Feature: An administrator can manage Block plugins
In order to alter the user experience
As an admin
I can manage block plugins
@javascript
Scenario: An administrator can control the enabled state of block plugins using JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Blocks > Manage blocks" in site administration
When I click on "Disable Latest badges" "link"
Then I should see "Latest badges disabled."
And "Disable Latest badges" "link" should not exist
But "Enable Latest badges" "link" should exist
When I click on "Enable Latest badges" "link"
Then I should see "Latest badges enabled."
And "Enable Latest badges" "link" should not exist
But "Disable Latest badges" "link" should exist
Scenario: An administrator can control the enabled state of block plugins without JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Blocks > Manage blocks" in site administration
When I click on "Disable Latest badges" "link"
Then I should see "Latest badges disabled."
And "Disable Latest badges" "link" should not exist
But "Enable Latest badges" "link" should exist
When I click on "Enable Latest badges" "link"
Then I should see "Latest badges enabled."
And "Enable Latest badges" "link" should not exist
But "Disable Latest badges" "link" should exist
@javascript
Scenario: An administrator can control the protected state of block plugins using JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Blocks > Manage blocks" in site administration
When I click on "Protect instances of Latest badges" "link"
Then I should see "Latest badges block instances are protected."
And "Protect instances of Latest badges" "link" should not exist
But "Unprotect instances of Latest badges" "link" should exist
And "Protect instances of Activities" "link" should exist
When I click on "Unprotect instances of Latest badges" "link"
Then I should see "Latest badges block instances are unprotected."
And "Unprotect instances of Activities" "link" should not exist
But "Protect instances of Latest badges" "link" should exist
And "Protect instances of Activities" "link" should exist
Scenario: An administrator can control the protected state of block plugins without JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Blocks > Manage blocks" in site administration
When I click on "Protect instances of Latest badges" "link"
Then I should see "Latest badges block instances are protected."
And "Protect instances of Latest badges" "link" should not exist
But "Unprotect instances of Latest badges" "link" should exist
And "Protect instances of Activities" "link" should exist
When I click on "Unprotect instances of Latest badges" "link"
Then I should see "Latest badges block instances are unprotected."
And "Unprotect instances of Activities" "link" should not exist
But "Protect instances of Latest badges" "link" should exist
And "Protect instances of Activities" "link" should exist
+30
View File
@@ -0,0 +1,30 @@
@core @core_admin
Feature: An administrator can manage Media plugins
In order to alter the user experience
As an admin
I can manage media plugins
@javascript
Scenario: An administrator can control the enabled state of media plugins using JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Media players > Manage media players" in site administration
When I click on "Disable YouTube" "link"
Then I should see "YouTube disabled."
And "Disable YouTube" "link" should not exist
But "Enable YouTube" "link" should exist
When I click on "Enable YouTube" "link"
Then I should see "YouTube enabled."
And "Enable YouTube" "link" should not exist
But "Disable YouTube" "link" should exist
Scenario: An administrator can control the enabled state of media plugins without JavaScript
Given I am logged in as "admin"
And I navigate to "Plugins > Media players > Manage media players" in site administration
When I click on "Disable YouTube" "link"
Then I should see "YouTube disabled."
And "Disable YouTube" "link" should not exist
But "Enable YouTube" "link" should exist
When I click on "Enable YouTube" "link"
Then I should see "YouTube enabled."
And "Enable YouTube" "link" should not exist
But "Disable YouTube" "link" should exist
@@ -0,0 +1,52 @@
@core @core_admin
Feature: MoodleNet outbound configuration
In order to send activity/resource to MoodleNet
As a Moodle administrator
I need to set outbound configuration
Background:
Given I log in as "admin"
Scenario: Share to MoodleNet experimental flag
Given I navigate to "Development > Experimental" in site administration
Then "Enable sharing to MoodleNet" "field" should exist
And the field "Enable sharing to MoodleNet" matches value "0"
Scenario: Outbound configuration without experimental flag enable yet
Given I navigate to "MoodleNet" in site administration
Then I should not see "MoodleNet outbound settings"
Scenario: Outbound configuration without OAuth 2 service setup yet
Given the following config values are set as admin:
| enablesharingtomoodlenet | 1 |
When I navigate to "MoodleNet" in site administration
Then I should see "MoodleNet outbound settings"
And I click on "MoodleNet outbound settings" "link"
And the field "OAuth 2 service" matches value "None"
And I should see "Select a MoodleNet OAuth 2 service to enable sharing to that MoodleNet site. If the service doesn't exist yet, you will need to create it."
And I click on "create" "link"
And I should see "OAuth 2 services"
Scenario: Outbound configuration with OAuth 2 service setup
Given a MoodleNet mock server is configured
And the following config values are set as admin:
| enablesharingtomoodlenet | 1 |
And I navigate to "Server > OAuth 2 services" in site administration
And I press "Custom"
And I should see "Create new service: Custom"
And I set the following fields to these values:
| Name | Testing custom service |
| Client ID | thisistheclientid |
| Client secret | supersecret |
And I press "Save changes"
When I navigate to "MoodleNet > MoodleNet outbound settings" in site administration
Then the field "OAuth 2 service" matches value "None"
And I navigate to "Server > OAuth 2 services" in site administration
And I press "MoodleNet"
And I should see "Create new service: MoodleNet"
And I change the MoodleNet field "Service base URL" to mock server
And I press "Save changes"
And I navigate to "MoodleNet > MoodleNet outbound settings" in site administration
And the "OAuth 2 service" "field" should be enabled
And I should see "MoodleNet" in the "OAuth 2 service" "select"
And I should not see "Testing custom service" in the "OAuth 2 service" "select"
+113
View File
@@ -0,0 +1,113 @@
@core @core_admin @core_course @javascript
Feature: Reset course indentation
In order to reset indentation in course modules
As a admin
I want change indent value for all the modules of a course format courses in one go
Background:
Given the following "courses" exist:
| fullname | shortname | format |
| Topics Course 1 | T1 | topics |
| Topics Course 2 | T2 | topics |
| Weekly Course 1 | W1 | weeks |
| Weekly Course 2 | W2 | weeks |
And the following "activities" exist:
| activity | name | intro | course | idnumber |
| forum | Topics forum name | Topics forum description | T1 | forum1 |
| data | Topics database name | Topics database description | T1 | data1 |
| wiki | Topics wiki name | Topics wiki description | T2 | wiki1 |
| forum | Weekly forum name | Weekly forum description | W1 | forum2 |
| data | Weekly database name | Weekly database description | W1 | data2 |
| wiki | Weekly wiki name | Weekly wiki description | W2 | wiki2 |
And I log in as "admin"
And I am on "Topics Course 1" course homepage with editing mode on
And I open "Topics forum name" actions menu
And I click on "Move right" "link" in the "Topics forum name" activity
And I open "Topics forum name" actions menu
And "Move right" "link" in the "Topics forum name" "activity" should not be visible
And "Move left" "link" in the "Topics forum name" "activity" should be visible
And I press the escape key
And I open "Topics database name" actions menu
And "Move right" "link" in the "Topics database name" "activity" should be visible
And "Move left" "link" in the "Topics database name" "activity" should not be visible
And I am on "Topics Course 2" course homepage with editing mode on
And I open "Topics wiki name" actions menu
And I click on "Move right" "link" in the "Topics wiki name" activity
And I open "Topics wiki name" actions menu
And "Move right" "link" in the "Topics wiki name" "activity" should not be visible
And "Move left" "link" in the "Topics wiki name" "activity" should be visible
And I am on "Weekly Course 1" course homepage with editing mode on
And I open "Weekly forum name" actions menu
And I click on "Move right" "link" in the "Weekly forum name" activity
And I open "Weekly forum name" actions menu
And "Move right" "link" in the "Weekly forum name" "activity" should not be visible
And "Move left" "link" in the "Weekly forum name" "activity" should be visible
And I press the escape key
And I open "Weekly database name" actions menu
And "Move right" "link" in the "Weekly database name" "activity" should be visible
And "Move left" "link" in the "Weekly database name" "activity" should not be visible
And I am on "Weekly Course 2" course homepage with editing mode on
And I open "Weekly wiki name" actions menu
And I click on "Move right" "link" in the "Weekly wiki name" activity
And I open "Weekly wiki name" actions menu
And "Move right" "link" in the "Weekly wiki name" "activity" should not be visible
And "Move left" "link" in the "Weekly wiki name" "activity" should be visible
Scenario Outline: Apply course indentation reset
Given I navigate to "Plugins > Course formats > <format> format" in site administration
And I wait "5" seconds
And "Reset indentation sitewide" "link" should exist
When I click on "Reset indentation sitewide" "link"
And I should see "Reset indentation sitewide"
And "Reset indentation sitewide" "button" should exist
And I click on "Reset indentation sitewide" "button"
Then I should see "Indentation reset."
And I am on "<format> Course 1" course homepage with editing mode on
And I open "<format> forum name" actions menu
And "Move right" "link" in the "<format> forum name" "activity" should be visible
And "Move left" "link" in the "<format> forum name" "activity" should not be visible
And I press the escape key
And I open "<format> database name" actions menu
And "Move right" "link" in the "<format> database name" "activity" should be visible
And "Move left" "link" in the "<format> database name" "activity" should not be visible
And I am on "<format> Course 2" course homepage with editing mode on
And I open "<format> wiki name" actions menu
And "Move right" "link" in the "<format> wiki name" "activity" should be visible
And "Move left" "link" in the "<format> wiki name" "activity" should not be visible
# Check other course formats had not been reset
And I am on "<other> Course 1" course homepage with editing mode on
And I open "<other> forum name" actions menu
And "Move right" "link" in the "<other> forum name" "activity" should not be visible
And "Move left" "link" in the "<other> forum name" "activity" should be visible
Examples:
| format | other |
| Topics | Weekly |
| Weekly | Topics |
Scenario Outline: Cancel course indentation reset
Given I navigate to "Plugins > Course formats > <format> format" in site administration
And "Reset indentation sitewide" "link" should exist
When I click on "Reset indentation sitewide" "link"
And I should see "Reset indentation sitewide"
And "Reset indentation sitewide" "button" should exist
And "Cancel" "button" should exist
And I click on "Cancel" "button"
Then I should not see "Indentation reset."
And I am on "<format> Course 1" course homepage with editing mode on
And I open "<format> forum name" actions menu
And "Move right" "link" in the "<format> forum name" "activity" should not be visible
And "Move left" "link" in the "<format> forum name" "activity" should be visible
And I press the escape key
And I open "<format> database name" actions menu
And "Move right" "link" in the "<format> database name" "activity" should be visible
And "Move left" "link" in the "<format> database name" "activity" should not be visible
And I am on "<format> Course 2" course homepage with editing mode on
And I open "<format> wiki name" actions menu
And "Move right" "link" in the "<format> wiki name" "activity" should not be visible
And "Move left" "link" in the "<format> wiki name" "activity" should be visible
Examples:
| format |
| Topics |
| Weekly |
+11 -1
View File
@@ -1,4 +1,4 @@
@core @core_admin
@core @core_admin @core_webservice
Feature: Web service user settings
In order to configure authorised users for a web service
As an admin
@@ -29,3 +29,13 @@ Feature: Web service user settings
Then I should see "User One" in the ".alloweduserlist" "css_element"
And I should see "1@example.org" in the ".alloweduserlist" "css_element"
And I should see "Kermit" in the ".alloweduserlist" "css_element"
@javascript
Scenario: Add a function to a web service
When I log in as "admin"
And I navigate to "Server > Web services > External services" in site administration
And I click on "Functions" "link" in the "Silly service" "table_row"
And I follow "Add functions"
And I set the field "Name" to "core_blog_get_entries"
And I click on "Add functions" "button" in the "#fgroup_id_buttonar" "css_element"
Then I should see "core_blog_get_entries" in the "generaltable" "table"
+112
View File
@@ -0,0 +1,112 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
declare(strict_types=1);
namespace core_admin\external;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/webservice/tests/helpers.php');
/**
* Unit tests to test block protection changes.
*
* @package core
* @covers \core_admin\external\set_block_protection
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_block_protection_test extends \externallib_advanced_testcase {
/**
* Test execute method with no login.
*/
public function test_execute_no_login(): void {
$this->expectException(\require_login_exception::class);
set_block_protection::execute('block_login', 1);
}
/**
* Test execute method with no login.
*/
public function test_execute_no_capability(): void {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
$this->expectException(\required_capability_exception::class);
set_block_protection::execute('block_login', 1);
}
/**
* Test the execute function with a range of parameters.
*
* @dataProvider execute_provider
* @param string $block
* @param int $targetstate
* @param bool $isundeletable
*/
public function test_execute(
string $block,
int $targetstate,
bool $isundeletable,
): void {
$this->resetAfterTest();
$this->setAdminUser();
set_block_protection::execute($block, $targetstate);
$undeletable = \block_manager::get_undeletable_block_types();
[, $pluginname] = explode('_', $block, 2);
if ($isundeletable) {
$this->assertNotFalse(array_search($pluginname, $undeletable));
} else {
$this->assertFalse(array_search($pluginname, $undeletable));
}
$this->assertCount(1, \core\notification::fetch());
}
/**
* Data provider for test_execute.
*
* @return array
*/
public function execute_provider(): array {
return [
[
'block_login',
1,
true,
],
[
'block_login',
0,
false,
],
];
}
/**
* Assert that an exception is thrown when the block does not exist.
*/
public function execute_block_does_not_exist(): void {
$this->expectException(\dml_missing_record_exception::class);
set_block_protection::execute('fake_block', 1);
$this->assertDebuggingCalledCount(1);
}
}
+166
View File
@@ -0,0 +1,166 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
declare(strict_types=1);
namespace core_admin\external;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/webservice/tests/helpers.php');
/**
* Unit tests to configure the plugin order.
*
* Note: Not all plugins can be ordered, so this test is limited to those which support it.
*
* @package core
* @covers \core_admin\external\set_plugin_state
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_plugin_order_test extends \externallib_advanced_testcase {
/**
* Text execute method for editor plugins, which support ordering.
*
* @dataProvider execute_editor_provider
* @param string $initialstate The initial state of the plugintype
* @param string $plugin The name of the plugin
* @param int $direction
* @param array $neworder
* @param string $newstate
*/
public function test_execute_editors(
string $initialstate,
string $plugin,
int $direction,
array $neworder,
string $newstate,
): void {
global $CFG;
$this->resetAfterTest();
$this->setAdminUser();
$CFG->texteditors = $initialstate;
set_plugin_order::execute($plugin, $direction);
$this->assertSame(
$neworder,
array_keys(\core\plugininfo\editor::get_sorted_plugins()),
);
$this->assertSame($newstate, $CFG->texteditors);
}
/**
* Data provider for base tests of the execute method.
*
* @return array
*/
public function execute_editor_provider(): array {
return [
[
'initialstate' => 'textarea,tiny',
'pluginname' => 'editor_textarea',
'direction' => 1, // DOWN.
'expected' => [
'tiny',
'textarea',
'atto',
],
'newtexteditors' => 'tiny,textarea',
],
[
'initialstate' => 'textarea,tiny',
'pluginname' => 'editor_textarea',
'direction' => -1, // UP.
'expected' => [
'textarea',
'tiny',
'atto',
],
'newtexteditors' => 'textarea,tiny',
],
[
'initialstate' => 'textarea,tiny',
'pluginname' => 'editor_tiny',
'direction' => 1, // DOWN.
// Tiny is already at the bottom of the list of enabled plugins.
'expected' => [
'textarea',
'tiny',
'atto',
],
'newtexteditors' => 'textarea,tiny',
],
[
'initialstate' => 'textarea,tiny',
'pluginname' => 'editor_atto',
'direction' => 1, // DOWN.
// Atto is not enabled. Disabled editors are listed lexically after enabled editors.
'expected' => [
'textarea',
'tiny',
'atto',
],
'newtexteditors' => 'textarea,tiny',
],
];
}
/**
* Text execute method for plugins which do not support ordering.
*
* @dataProvider execute_non_orderable_provider
* @param string $plugin
*/
public function test_execute_editors_non_orderable(string $plugin): void {
$this->resetAfterTest();
$this->setAdminUser();
$this->assertIsArray(set_plugin_order::execute($plugin, 1));
}
public function execute_non_orderable_provider(): array {
return [
// Activities do not support ordering.
['mod_assign'],
// Nor to blocks.
['block_login'],
];
}
/**
* Test execute method with no login.
*/
public function test_execute_no_login(): void {
$this->expectException(\require_login_exception::class);
set_plugin_order::execute('editor_tiny', 1);
}
/**
* Test execute method with no login.
*/
public function test_execute_no_capability(): void {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
$this->expectException(\required_capability_exception::class);
set_plugin_order::execute('editor_tiny', 1);
}
}
+131
View File
@@ -0,0 +1,131 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
declare(strict_types=1);
namespace core_admin\external;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/webservice/tests/helpers.php');
/**
* Unit tests to configure the enabled/disabled state of a plugin.
*
* @package core
* @covers \core_admin\external\set_plugin_state
* @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class set_plugin_state_test extends \externallib_advanced_testcase {
/**
* Text execute method.
*
* @dataProvider execute_standard_provider
* @param string $plugin The name of the plugin
* @param int|null $initialstate The initial state of the plugin
* @param int $newstate The target state
* @param int $notificationcount The number of notifications expected
*/
public function test_execute(
string $plugin,
?int $initialstate,
int $newstate,
int $notificationcount,
): void {
$this->resetAfterTest();
$this->setAdminUser();
if ($initialstate !== null) {
[$plugintype, $pluginname] = \core_component::normalize_component($plugin);
$manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
$manager::enable_plugin($pluginname, $initialstate);
\core\notification::fetch();
}
set_plugin_state::execute($plugin, $newstate);
$this->assertCount($notificationcount, \core\notification::fetch());
}
/**
* Data provider for base tests of the execute method.
*
* @return array
*/
public function execute_standard_provider(): array {
$generatetestsfor = function (string $plugin): array {
return [
[
'plugin' => $plugin,
'initialstate' => null,
'newstate' => 0,
'notificationcount' => 1,
],
[
'plugin' => $plugin,
'initialstate' => 1,
'newstate' => 0,
'notificationcount' => 1,
],
[
'plugin' => $plugin,
'initialstate' => 1,
'newstate' => 1,
'notificationcount' => 0,
],
[
'plugin' => $plugin,
'initialstate' => 0,
'newstate' => 0,
'notificationcount' => 0,
],
[
'plugin' => $plugin,
'initialstate' => 0,
'newstate' => 1,
'notificationcount' => 1,
],
];
};
return array_merge(
$generatetestsfor('mod_assign'),
$generatetestsfor('editor_tiny'),
$generatetestsfor('tiny_h5p'),
$generatetestsfor('block_badges'),
);
}
/**
* Test execute method with no login.
*/
public function test_execute_no_login(): void {
$this->expectException(\require_login_exception::class);
set_plugin_state::execute('mod_assign', 1);
}
/**
* Test execute method with no login.
*/
public function test_execute_no_capability(): void {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
$this->expectException(\required_capability_exception::class);
set_plugin_state::execute('mod_assign', 1);
}
}
@@ -36,10 +36,6 @@ class preset_deleted extends base {
return "User {$this->userid} has deleted the preset with id {$this->objectid}.";
}
public function get_legacy_logdata(): array {
return [$this->courseid, 'tool_admin_presets', 'delete', '', $this->objectid, $this->contextinstanceid];
}
protected function init(): void {
$this->data['crud'] = 'd';
$this->data['edulevel'] = self::LEVEL_OTHER;
@@ -41,10 +41,6 @@ class preset_exported extends base {
['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]);
}
public function get_legacy_logdata(): array {
return [$this->courseid, 'tool_admin_presets', 'export', '', $this->objectid, $this->contextinstanceid];
}
protected function init(): void {
$this->data['crud'] = 'c';
$this->data['edulevel'] = self::LEVEL_OTHER;
@@ -41,10 +41,6 @@ class preset_imported extends base {
['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]);
}
public function get_legacy_logdata(): array {
return [$this->courseid, 'tool_admin_presets', 'import', '', $this->objectid, $this->contextinstanceid];
}
protected function init(): void {
$this->data['crud'] = 'c';
$this->data['edulevel'] = self::LEVEL_OTHER;

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