Commit graph

84037 commits

Author SHA1 Message Date
Dan Poltawski
49c2964b71 MDL-37765 block_login: fix whitespace 2017-04-03 12:55:07 +01:00
Dan Poltawski
3ca68f24f7 Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle 2017-04-03 12:41:56 +01:00
Dan Poltawski
1e3aa70ff0 MDL-37765 version: bump 2017-04-03 09:14:46 +01:00
Dan Poltawski
02eaa42f23 Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle 2017-04-03 09:13:55 +01:00
Andrew Nicols
6fdf167b0f Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle 2017-04-03 15:38:53 +08:00
Juan Leyva
8446ba3641 MDL-50970 core_block: New Web Service core_block_get_course_blocks 2017-04-03 09:27:53 +02:00
Jun Pataleta
cefd780fa3 MDL-58462 mod_data: Generate users with different names
* Give test users different first and last names.
* Declare class member variables instead of dynamically assigning them.
* Rename member variable $data to $database since it conflicts with the
  private member variable PHPUnit_Framework_TestCase::$data.
* Replace setExpectedException usage with expectException().
2017-04-03 13:49:25 +08:00
Damyon Wiese
aa89bf2e6c MDL-58220 repo: Dont expect file info for any file
Some plugins do not implement the file info callback so expect and handle null in this case.
2017-04-03 13:43:27 +08:00
Damyon Wiese
1d43165a5a MDL-58220 oauth2: Provide template specific help links
E.g. separate pages for Microsoft / Google.
2017-04-03 13:43:27 +08:00
Damyon Wiese
14cfd280d3 MDL-58220 oauth2: Sanity check user pictures 2017-04-03 13:43:27 +08:00
Damyon Wiese
7b9f5b9986 MDL-58220 oauth2: Cleanup on user delete
Delete the linked logins for this user account when it is deleted.
2017-04-03 13:43:27 +08:00
Damyon Wiese
512e681a3b MDL-58220 oauth2: Don't login as deleted users
Also prevent sesskey error on first page of new logins.
2017-04-03 13:43:27 +08:00
Damyon Wiese
7f15866006 MDL-58220 oauth2: Use email as default username
And give better error messages.
2017-04-03 13:43:27 +08:00
Damyon Wiese
e7688f559a MDL-58220 onedrive: Add import from skydrive
If the skydrive repo exists - show a button on the config page for the onedrive repo to "steal" all the files
from the other repo and disable it.
2017-04-03 13:43:27 +08:00
Damyon Wiese
86a5f1efe1 MDL-58220 repository_skydrive: Add deprecation warning 2017-04-03 13:43:27 +08:00
Damyon Wiese
e518ea7949 MDL-58220 repository_onedrive: rename from skydrive
Update all references from skydrive to onedrive in the code / lang strings.
2017-04-03 13:43:27 +08:00
Damyon Wiese
9b8a36e882 MDL-58220 repository_skydrive: put back existing
Restore the existing skydrive repo from integration / master.

Because we cannot upgrade cleanly - it's better not to touch the existing repo.
2017-04-03 13:43:27 +08:00
Damyon Wiese
0931acf96b MDL-58220 repository: Move skydrive -> onedrive 2017-04-03 13:43:27 +08:00
Damyon Wiese
33536fb2b7 MDL-58220 repositories: missing/disabled issuer
This makes the code checking for a missing / disabled issuer a bit cleaner.
2017-04-03 13:43:26 +08:00
Dan Poltawski
5afb4f0e50 MDL-58220 repository: prevent repo breaking when issuer doesn't exist 2017-04-03 13:43:26 +08:00
Damyon Wiese
9c2baf096b MDL-58220 unittests: Fix randomly failing unit test
The scheduled task unit tests does not handle 'R' fields properly. We don't need it here.
2017-04-03 13:43:26 +08:00
Damyon Wiese
4dc53b15fd MDL-58220 oauth2: More prominent help link 2017-04-03 13:43:26 +08:00
Damyon Wiese
bc55c88ba0 MDL-58220 tool_oauth2: Lang string fix 2017-04-03 13:43:26 +08:00
Damyon Wiese
3605eb9a9e MDL-58220 tool_oauth2: Disable short forms
All of these forms only have one section so we should disable short forms.
2017-04-03 13:43:26 +08:00
Damyon Wiese
ba3b0145ff MDL-58220 repository_skydrive: Remove references to google 2017-04-03 13:43:26 +08:00
Damyon Wiese
eb47ad4a6e MDL-58220 repository: More docs / comments
More docs / comments for the reference_file_selected function used by controlled links.
2017-04-03 13:43:26 +08:00
Damyon Wiese
9165e83831 MDL-58220 unittests: Fix errors found in unittests 2017-04-03 13:43:26 +08:00
Damyon Wiese
6f8a03f196 MDL-58220 skydrive: Upgrade from old settings
Upgrade the oauth2 settings to an oauth2 issuer.
2017-04-03 13:43:26 +08:00
Damyon Wiese
0b9bb5bdc4 MDL-58220 oauth2: Alphabetise lang strings. 2017-04-03 13:43:26 +08:00
Damyon Wiese
1a911be57b MDL-58220 oauth2: Fix docs in test file
(and remove unused global $SESSION).
2017-04-03 13:43:26 +08:00
Damyon Wiese
e25362a7db MDL-58220 auth: $OUTPUT -> $output
Don't use global $OUTPUT when there is a more specific renderer.
2017-04-03 13:43:26 +08:00
Damyon Wiese
d9fbe3146c MDL-58220 oauth2: Use the same list of user fields
Authentication has a hard coded list of valid internal user fields - but they are in a class variable. We need them
in oauth user_field_mapping so we need to move them to a central place and call them from oauth2 and auth.
2017-04-03 13:43:26 +08:00
Damyon Wiese
68ecf7635b MDL-58220 oauth2: tighten the param types
These come from external sources - but still should not contain crazy stuff.
2017-04-03 13:43:26 +08:00
Damyon Wiese
440df5fb7f MDL-58220 oauth2: quote image attributes 2017-04-03 13:43:26 +08:00
Damyon Wiese
c45d4b6a73 MDL-58220 oauth2: Change $OUTPUT to $this 2017-04-03 13:43:26 +08:00
Damyon Wiese
7949b3b2ac MDL-58220 oauth2: Remove is_system_account_setup_supported
This was left from an earlier branch but no longer useful.
2017-04-03 13:43:26 +08:00
Damyon Wiese
5b0b35c096 MDL-58220 oauth2: Add is_configured to issuer
Saves repeated checks for clientid and clientsecret.
2017-04-03 13:43:25 +08:00
Damyon Wiese
5aa0f0ae48 MDl-58220 auth_oauth2: Skip upgrade for new plugin 2017-04-03 13:43:25 +08:00
Damyon Wiese
8d90d29460 MDL-58220 oauth2: Use iputils to check domain
Allows wild cards and more strict checking against spec.
2017-04-03 13:43:25 +08:00
Damyon Wiese
4ab80291e7 MDL-58220 tool_oauth2: forms cleanup
Remove extra field length attributes and fix type of action fields.
2017-04-03 13:43:25 +08:00
Damyon Wiese
ae596d4a54 MDL-58220 auth_oauth2: Remove allow linked logins
This was already removed - I just missed some spots.
2017-04-03 13:43:25 +08:00
Damyon Wiese
5b926a6a09 MDL-58220 oauth2: Move help icons to table header
In the Site Administration -> Server -> OAuth 2 Services page.
2017-04-03 13:43:25 +08:00
Damyon Wiese
818e789a00 MDL-58220 oauth2: Remove extra step
Show create google/facebook/office365 buttons on the main page instead
of hiding them behind a click.
2017-04-03 13:43:25 +08:00
Damyon Wiese
4a32445dc9 MDL-58220 oauth2: use PARAM_RAW_TRIMMED
Client ID and secret and copy/pasted from elsewhere so trim them.
2017-04-03 13:43:25 +08:00
Damyon Wiese
bfc60d386d MDL-58220 auth_oauth: return false for non-oauth
Always return false for non-oauth logins.
2017-04-03 13:43:25 +08:00
Damyon Wiese
f59d81f487 MDL-58220 block_login: Update icon rendering of idp list 2017-04-03 13:43:25 +08:00
Damyon Wiese
13b449f4a5 MDL-58220 oauth2: cibot cleanups 2017-04-03 13:43:25 +08:00
Damyon Wiese
99e3c347f9 MDL-58220 oauth2: Minor cleanups
Fixes spotted by Jun in peer review.
2017-04-03 13:43:25 +08:00
Damyon Wiese
28b592d5a6 MDL-58338 oauth2: Force email confirmation
New accounts and linking a login to an existing account MUST go through email verification.
We cannot trust the emails we get from oauth providers have been confirmed.

Part of MDL-58220
2017-04-03 13:43:25 +08:00
Damyon Wiese
d5bb9f1ffc MDL-58334 repositories: Offline downloads
Support an optional param for offline downloads for repositories supporting external links (googledrive and skydrive).

Part of MDL-58220
2017-04-03 13:43:25 +08:00