tjhunt [Mon, 7 Jan 2008 16:46:35 +0000 (16:46 +0000)]
Use the locale to sort the list of activites everywhere. This matches a change a made in one place before christmas. If you don't do this, the PHP sorts by ASCII order, so mixed case names, or special characters, get sorted wrongly. Merged from MOODLE_19_STABLE.
poltawski [Mon, 7 Jan 2008 12:21:06 +0000 (12:21 +0000)]
MDL-6529 - strip slashes when displaying category added success messsage
merged from MOODLE_19_STABLE
moodler [Mon, 7 Jan 2008 03:19:52 +0000 (03:19 +0000)]
Automatic installer.php lang files by installer_builder (
20080107)
mjollnir_ [Mon, 7 Jan 2008 01:54:28 +0000 (01:54 +0000)]
New feature: Command line installer. Credit: Dilan Anurudda.
This was a Google Summer of Code 2007 Project.
This introduces two new files, admin/cliupgrader.php and lib/installlib.php.
It also introduces a new PEAR library, Console_GetOpt. I have recieved permission from the upstream author to include this in GPL Moodle (essentially dual license it) - notes in lib/pear.
Most stuff that outputs html during install gets suppressed by the use of a constant.
Run the script like php admin/cliupgrade.php --help for info.
Note that this all uses strings from install/ rather than lang, so I have updated stringnames.txt accordingly and they'll all be broken until the cronjob that generates them runs.
ikawhero [Mon, 7 Jan 2008 01:02:45 +0000 (01:02 +0000)]
Adding method to allow printing of the enrolment key form code when using PayPal.
Merged from MOODLE_19_STABLE
martinlanghoff [Sun, 6 Jan 2008 23:26:19 +0000 (23:26 +0000)]
accesslib: get_users_by_capability() now excludes doanything'ers properly
With some subselect-outer-join poison-pill magic, when the we don't
want doanything users, we remove the roles that would grant such
dubious status.
Just a flick of the SQL muscle, actually.
martinlanghoff [Sun, 6 Jan 2008 23:26:08 +0000 (23:26 +0000)]
accesslib: get_users_by_capability() fix subselect with ra.hidden
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:25:51 +0000 (23:25 +0000)]
lib/deprecatedlib: use sort_by_roleassignment_authority() to sort RAs
After calling get_users_by_capability(), use
sort_by_roleassignment_authority() to mimic what older versions of
Moodle did.
Affects: get_teacher(), get_course_teachers()
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:25:37 +0000 (23:25 +0000)]
accesslib: Introducing sort_by_roleassignment_authority()
This will help us bridge the gap from olden-style order-by
user_teachers.id. From the phpdoc...
Will re-sort a $users results array (from get_users_by_capability(), usually)
based on a sorting policy. This is to support the odd practice of
sorting teachers by 'authority', where authority was "lowest id of the role
assignment".
Will execute 1 database query. Only suitable for small numbers of users, as it
uses an u.id IN() clause.
Notes about the sorting criteria.
As a default, we cannot rely on role.sortorder because then
admins/coursecreators will always win. That is why the sane
rule "is locality matters most", with sortorder as 2nd
consideration.
If you want role.sortorder, use the 'sortorder' policy, and
name explicitly what roles you want to cover. It's probably
a good idea to see what roles have the capabilities you want
(array_diff() them against roiles that have 'can-do-anything'
to weed out admin-ish roles. Or fetch a list of roles from
variables like $CFG->coursemanagers .
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:25:26 +0000 (23:25 +0000)]
lib/deprecatedlib: enrol/manual: Fix calls to get_users_by_capability() to avoid ra
get_users_by_capability() can no longer refer to properties of role
assignments or roles, as the capability aggregate is indirect.
Fixes:
get_teacher() - though the results will be poor, as we cannot provide
role.sortorder reliably
(used mainly by mod/workshop)
get_course_teachers() - which seems broken for a lot of situations as
its default parameters still refer to old tables.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:25:15 +0000 (23:25 +0000)]
enrol/manual: Fix calls to get_users_by_capability() to avoid ra
get_users_by_capability() can no longer refer to properties of role
assignments or roles, as the capability aggregate is indirect.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:25:03 +0000 (23:25 +0000)]
accesslib: get_user_by_capability() - Fix pagination
Ooops! Off-by-one error
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:24:50 +0000 (23:24 +0000)]
datalib: get_admins() - Rewrite to avoid get_users_by_capability()
get_admins() and get_admin() were counting on
get_users_by_capability() returning a role-assignment id to pick the
"primary" admin account. With the get_users_by_capability() rewrite,
we no longer have an RA id to clearly blame for the capability.
So, rewrite get_admins() based on the known-good SQL used in
is_siteadmin().
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:24:37 +0000 (23:24 +0000)]
accesslib: get_user_by_capability() - Fix last_access handling
We were missing $courseid, which is actually $context->instanceid.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:24:25 +0000 (23:24 +0000)]
accesslib: get_user_by_capability() - Move capcheck to has_capability_from_rarc()
This fixes the handling of default roles as "tie breakers" for lower
RAs in conflict, and simplifies the code a lot.
The main loop in get_user_by_capability() runs a simpler state machine
that just collects role assignments (roleid and depth), and handles
pagination.
The complex part of the state machine has moved to
has_capability_from_rarc() which will walk the data structures
collected by get_user_by_capability() for each user.
Having all the complex state handling of $hascap there makes things a
lot easier for pagination and general sanity of
get_user_by_capability().
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:24:14 +0000 (23:24 +0000)]
accesslib: get_user_by_capability() - Move hidden RA checks to subselect
we don't deal with RAs in the main SELECT -- we deal with _capabilities_
which is an entirely different matter ;-) -- so push the ra.hidden check
into the subselect.
Also, remove ra.hidden from the default list of fields. Hopefully no
callers are using ra.hidden -- if they are, they should be calling
something else, as this function deals with capabilities. So we might
need an audit of callers, to check that noone is expecting ra.hidden
to be there.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:23:58 +0000 (23:23 +0000)]
accesslib: get_user_by_capability() - Handle the complex case
With this commit, we can handle the complex cases with
- correct pagination, but not very efficient over large datasets
- mostly-correct application of the override rules
The structure of the code is fairly complex in that we want to do
it without holding all the recs in memory, so we use a small state
machine. We have to handle the complex override rules over 1 or 2
permissions (when $doanything is set) so it all ends up quite complex.
There is one known issue with this code, in cases where the default
role ends up as the decider between 2 conflicting RAs, we fail to
apply it. This will need a bit of reorg of how the loop works.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:23:46 +0000 (23:23 +0000)]
accesslib: get_user_by_capability() - Simple cases now handle multiple RAs
The "simple" case SQL did not handle multiple enrolments for the same
user correctly -- it would generate multiple rows for those users,
incorrectly.
With this patch we move the join to RA to a subselect where DISTINCT
takes care of things.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:23:24 +0000 (23:23 +0000)]
accesslib: get_user_by_capability() - Handle complex rolecap resolution
With this patch, get_user_by_capability() can handle the cases where
users have multiple role assignments to the same course, and PREVENTs
and PROHIBITs affect the rolecaps of this course.
Without stored procedures we cannot resolve this entirely on the
server side - so in the complex cases we do as much as we can on SQL,
and post-process the data on the PHP side, including SQL-style
pagination.
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:22:26 +0000 (23:22 +0000)]
accesslib: get_user_by_capability() - First, handle simple cases
This patch reorganises the conditions and field handling so
we can spot if this is a call we can resolve in a single SQL
query that we just pass back the results.
If there are any PREVENTs or PROHIBITs, we need to delve into
more involved stuff...
MDL-12452
martinlanghoff [Sun, 6 Jan 2008 23:22:08 +0000 (23:22 +0000)]
accesslib: revert changes to get_users_by_capability() - MDL-12452 MDL-12451
The changes made by Yu and Tim are superceded by the patches that
follow -- and would not apply cleanly without this revert.
martinlanghoff [Sun, 6 Jan 2008 22:56:07 +0000 (22:56 +0000)]
lib/setup: restore sanity to rcache handling
$CFG->rcache is safe to keep, even as we are reading the config table.
This is because whenever we update the config table, all the rcache
plugins either mark the cache as dirty or they update the cache.
The reason we want to be able to preserve this is that rcache settings
in CFG should usually be set in config.php rather than in the config
table.
With this fix, we support both control points.
martinlanghoff [Sun, 6 Jan 2008 22:46:20 +0000 (22:46 +0000)]
dmllib:rcache_get()/rcache_set() clone cached records - we do not want magic references here - MDL-12827\n And calling fullclone() with the huge cost in serialize()/unserialize() is not needed.
moodler [Sun, 6 Jan 2008 03:12:37 +0000 (03:12 +0000)]
Automatic installer.php lang files by installer_builder (
20080106)
thepurpleblob [Fri, 4 Jan 2008 21:06:39 +0000 (21:06 +0000)]
MDL-12701:
Missing string
Merged from STABLE_18
nicolasconnault [Fri, 4 Jan 2008 09:23:42 +0000 (09:23 +0000)]
MDL-12827 Saving a clone of the $record in the cache instead of the record itself, to avoid referencing
nicolasconnault [Fri, 4 Jan 2008 09:22:25 +0000 (09:22 +0000)]
MDL-12829 Removed a hard-coded test integer
nicolasconnault [Fri, 4 Jan 2008 09:21:32 +0000 (09:21 +0000)]
MDL-12829 Removed a hard-coded test integer
nicolasconnault [Fri, 4 Jan 2008 06:49:30 +0000 (06:49 +0000)]
MDL-12829 Applied the sql fix
nicolasconnault [Fri, 4 Jan 2008 06:46:52 +0000 (06:46 +0000)]
MDL-12429 Applied and tested François' patches to 1.8, 1.9 and head.
nicolasconnault [Fri, 4 Jan 2008 06:45:55 +0000 (06:45 +0000)]
MDL-12429 Applied and tested François' patches to 1.8, 1.9 and head.
nicolasconnault [Fri, 4 Jan 2008 06:24:34 +0000 (06:24 +0000)]
MDL-12829 Applied the sql fix
moodler [Fri, 4 Jan 2008 05:20:00 +0000 (05:20 +0000)]
Fixed the navigation on the course assign roles tab MDL-12828
moodler [Fri, 4 Jan 2008 03:19:13 +0000 (03:19 +0000)]
Automatic installer.php lang files by installer_builder (
20080104)
poltawski [Thu, 3 Jan 2008 22:41:54 +0000 (22:41 +0000)]
MDL-12825 - add some extra height to popups in IE7, otherwise they cant
be used merged from MOODLE_19_STABLE
skodak [Thu, 3 Jan 2008 16:37:09 +0000 (16:37 +0000)]
MDL-12817 logout before 1.9 upgrade in order to prevent weird upgrade problems; merged from MOODLE_19_STABLE
skodak [Thu, 3 Jan 2008 15:03:32 +0000 (15:03 +0000)]
MDL-6786 Improved dropping of block and module tables during uninstall; merged from MOODLE_19_STABLE
moodler [Thu, 3 Jan 2008 03:11:58 +0000 (03:11 +0000)]
Automatic installer.php lang files by installer_builder (
20080103)
skodak [Wed, 2 Jan 2008 22:53:47 +0000 (22:53 +0000)]
MDL-9744 passwork field for ldap bind pw - patch by Iñaki Arenaza; merged from MOODLE_18_STABLE
skodak [Wed, 2 Jan 2008 22:36:31 +0000 (22:36 +0000)]
MDL-10975 enrol_database_sync.php will run even if the plugin is disabled - patch by Braden MacDonald; merged from MOODLE_19_STABLE
skodak [Wed, 2 Jan 2008 18:49:00 +0000 (18:49 +0000)]
MDL-11471 adodb 4.96a import; merged from MOODLE_19_STABLE
stronk7 [Wed, 2 Jan 2008 16:49:11 +0000 (16:49 +0000)]
Respect case of enumvalues. MDL-12803 ; Merged from MOODLE_19_STABLE
skodak [Wed, 2 Jan 2008 16:47:57 +0000 (16:47 +0000)]
MDL-12796 iplookup rewrite
poltawski [Tue, 1 Jan 2008 23:03:48 +0000 (23:03 +0000)]
MDL-12789 - dont unnecessarily iterate over all groups
skodak [Tue, 1 Jan 2008 22:25:11 +0000 (22:25 +0000)]
MDL-12794 admin setting for file location; merged from MOODLE_19_STABLE
skodak [Tue, 1 Jan 2008 17:23:05 +0000 (17:23 +0000)]
MDL-12793 PARAM_HOST incorrect cleaning; merged from MOODLE_19_STABLE
skodak [Tue, 1 Jan 2008 15:51:54 +0000 (15:51 +0000)]
MDL-12790 highlighting in admin search results breaks html
MDL-12791 add defaults parameter to format_admin_setting()
MDL-12792 search in admin settings and defaults
+ minor speedup of fast highlighting and fixed empty span tags
merged from MOODLE_19_STABLE
poltawski [Tue, 1 Jan 2008 15:30:57 +0000 (15:30 +0000)]
just tweaking comment for easy greppage
stronk7 [Tue, 1 Jan 2008 12:03:00 +0000 (12:03 +0000)]
Better behaviour for "-" course searches under MSSQL and Oracle. MDL-7312 ; merged from 19_STABLE
moodler [Tue, 1 Jan 2008 03:03:40 +0000 (03:03 +0000)]
Automatic installer.php lang files by installer_builder (
20080101)
skodak [Mon, 31 Dec 2007 23:18:06 +0000 (23:18 +0000)]
MDL-11845 fixed security issues in curl related code in new download_file_content() + minor fixes in Snoopy; merged from MOODLE_19_STABLE
skodak [Mon, 31 Dec 2007 15:55:36 +0000 (15:55 +0000)]
MDL-12786 admin search in configselect choices; merged from MOODLE_19_STABLE
skodak [Mon, 31 Dec 2007 15:37:12 +0000 (15:37 +0000)]
MDL-12782 magpie now uses download_file_content() - that should solve several remote RSS issues including proxy user/password + several download_file_content() improvements + other minor fixes; merged from MOODLE_19_STABLE
stronk7 [Mon, 31 Dec 2007 15:25:27 +0000 (15:25 +0000)]
Correct timezones listing when importing olson files ; merged from 19_STABLE
stronk7 [Mon, 31 Dec 2007 15:20:02 +0000 (15:20 +0000)]
Prevent some debugging notices, cast to object before inserting. Merged from 19_STABLE
stronk7 [Mon, 31 Dec 2007 15:08:08 +0000 (15:08 +0000)]
Moving from old "timezones" location to the new "timezone" one. MDL-12024 ; merged from 19_STABLE
poltawski [Mon, 31 Dec 2007 15:03:32 +0000 (15:03 +0000)]
MDL-12777 - no longer the second option, so tweak language
merged from MOODLE_19_STABLE
stronk7 [Mon, 31 Dec 2007 13:23:23 +0000 (13:23 +0000)]
1976 rules from 2007j Olson files. MDL-12024 ; merged from 19_STABLE
moodler [Mon, 31 Dec 2007 03:07:34 +0000 (03:07 +0000)]
Automatic installer.php lang files by installer_builder (
20071231)
stronk7 [Mon, 31 Dec 2007 01:10:54 +0000 (01:10 +0000)]
Missed this in my previous commit. MDL-12698 ; merged from 19_STABLE
stronk7 [Mon, 31 Dec 2007 01:07:49 +0000 (01:07 +0000)]
Change some constants to avoid name collisions. MDL-12698 ; Merged from MOODLE_19_STABLE
poltawski [Sun, 30 Dec 2007 23:10:42 +0000 (23:10 +0000)]
MDL-11845 - use the http 1.0 'Moved Temporarily' rather than unhelpful 'Found'
merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 22:55:10 +0000 (22:55 +0000)]
MDL-11830 a bit bigger button in login block, removing colons and adding css spacing; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 22:36:16 +0000 (22:36 +0000)]
MDL-12698, MDL-12569 - fixed inline docs; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 22:30:46 +0000 (22:30 +0000)]
MDL-12775 PARAM_INT value '' automatically converted to 0 in configtext settings; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 22:25:16 +0000 (22:25 +0000)]
MDL-11845 unmask password field type for proxy url - thanks Dan for reminding me; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 22:19:36 +0000 (22:19 +0000)]
MDL-12698, MDL-12569 - componentlib & langimport improvements and fixes; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 19:42:51 +0000 (19:42 +0000)]
MDL-11845 removing curl emulation library, snoopy has better support for proxies and seems to be more reliable on different platforms; spelling correction cURL instead of Curl; adding all proxy admin settings; better debug messages for file downloading; SOCKS5 proxy support; merged from MOODLE_19_STABLE
skodak [Sun, 30 Dec 2007 17:59:17 +0000 (17:59 +0000)]
MDL-12774 allow returning of errors from admin configtext settings; merged from MOODLE_19_STABLE
moodler [Sun, 30 Dec 2007 03:04:20 +0000 (03:04 +0000)]
Automatic installer.php lang files by installer_builder (
20071230)
mark-nielsen [Sat, 29 Dec 2007 22:48:48 +0000 (22:48 +0000)]
Merging fixes for MDL-12383 and MDL-12605 from MOODLE_19_STABLE
mark-nielsen [Sat, 29 Dec 2007 22:18:19 +0000 (22:18 +0000)]
Merging fix for MDL-12605 from MOODLE_19_STABLE
poltawski [Sat, 29 Dec 2007 22:11:47 +0000 (22:11 +0000)]
MDL-11306 - adding a bit of info to try and explain that you can use
.domain.com to allow subdomains
merged from MOODLE_19_STABLE
mark-nielsen [Sat, 29 Dec 2007 21:50:53 +0000 (21:50 +0000)]
Merging fix for MDL-11900 from MOODLE_19_STABLE
mark-nielsen [Sat, 29 Dec 2007 20:59:09 +0000 (20:59 +0000)]
Merging fix for MDL-12610 from MOODLE_19_STABLE
poltawski [Sat, 29 Dec 2007 20:31:10 +0000 (20:31 +0000)]
MDL-9925 - When a user presses cancel on restore they are sent to
/admin/. For teachers this gives an ugly access denied message,
so instead send them back to the course they came from.
Thanks to Wen Hao Chuang for the fix!
merged from MOODLE_19_STABLE
poltawski [Sat, 29 Dec 2007 20:03:03 +0000 (20:03 +0000)]
MDL-12763 - proxy_url() in langimport was doing its own custom proxied
download magic. Convert to use download_file_contents() for more
robust downloads. And also add a more helpful error message while i'm
at it.
merged from MOODLE_19_STABLE
skodak [Sat, 29 Dec 2007 16:49:26 +0000 (16:49 +0000)]
MDL-12756 print save button in admin search only when there are settings to save; merged from MOODLE_19_STABLE
skodak [Sat, 29 Dec 2007 16:38:25 +0000 (16:38 +0000)]
MDL-12752 making unsupported pages truly hidden; merged from MOODLE_19_STABLE
poltawski [Sat, 29 Dec 2007 15:38:14 +0000 (15:38 +0000)]
MDL-7242 eliminate last use of location to refer to city in profile where
it causes problems for translators
merged from MOODLE_19_STABLE
moodler [Sat, 29 Dec 2007 12:21:34 +0000 (12:21 +0000)]
Automatic installer.php lang files by installer_builder (
20071229)
poltawski [Sat, 29 Dec 2007 12:07:08 +0000 (12:07 +0000)]
remove debugging message, merged from MOODLE_19_STABLE
stronk7 [Sat, 29 Dec 2007 11:54:24 +0000 (11:54 +0000)]
Added note about automatic DB creation. MDL-9609
Merged from MOODLE_19_STABLE
stronk7 [Sat, 29 Dec 2007 11:51:49 +0000 (11:51 +0000)]
New string goes to installer lang files. MDL-9609
Merged from MOODLE_19_STABLE
stronk7 [Sat, 29 Dec 2007 11:47:46 +0000 (11:47 +0000)]
New string added to note about automatic DB creation. MDL-9609
Merged from MOODLE_19_STABLE
stronk7 [Sat, 29 Dec 2007 11:30:52 +0000 (11:30 +0000)]
Merged from MOODLE_19_STABLE. Under MySQL, create the db on install if possible. MDL-9609
moodler [Sat, 29 Dec 2007 03:05:36 +0000 (03:05 +0000)]
Automatic installer.php lang files by installer_builder (
20071229)
poltawski [Fri, 28 Dec 2007 23:25:34 +0000 (23:25 +0000)]
MDL-3842 - tweak text to clarify
merged from MOODLE_19_STABLE
poltawski [Fri, 28 Dec 2007 22:56:42 +0000 (22:56 +0000)]
MDL-4692 - initalise var, merged from MOODLE_19_STABLE
stronk7 [Fri, 28 Dec 2007 19:14:01 +0000 (19:14 +0000)]
Prevent race condition in event creation. MDL-5956.
Credit goes to Penny, Luke and Martin @ Catalyst.
Merged from MOODLE_19_STABLE
mchurch [Fri, 28 Dec 2007 17:14:01 +0000 (17:14 +0000)]
MDL-12703 - Use the 'welcometocourse' language string if there is no 'welcomemessage' property set in the course object. Currently, there does not seem to be any code or data items that would set this property.
mchurch [Fri, 28 Dec 2007 16:13:09 +0000 (16:13 +0000)]
MDL-12744 - Add ability to pass an extra button for use in print header for modules that use the course page to display themselves with blocks.
mchurch [Fri, 28 Dec 2007 16:04:30 +0000 (16:04 +0000)]
MDL-12704 - Added error handling to print_recent_activity() to prevent fatal errors in the case of missing files.
poltawski [Fri, 28 Dec 2007 12:58:08 +0000 (12:58 +0000)]
MDL-5598 - Custom feed titles on RSS block did not allow spaces or other
useful characters ;)
merged from MOODLE_19_STABLE
urs_hunkler [Fri, 28 Dec 2007 12:45:43 +0000 (12:45 +0000)]
merged from 1.9 :: MDL-12749 :: print_box_strart was closed with pint_simple_box_end. corrected.
poltawski [Fri, 28 Dec 2007 12:36:33 +0000 (12:36 +0000)]
MDL-2414 - using quotes in enrolment keys failed due to slashes.
merged from MOODLE_19_STABLE
iarenaza [Fri, 28 Dec 2007 12:06:22 +0000 (12:06 +0000)]
MDL-12323 MDL-4061 Don't connect to the LDAP server if update external is not set for any field.
Forward ported from MOODLE_18_STABLE.
moodler [Fri, 28 Dec 2007 06:48:31 +0000 (06:48 +0000)]
Just testing a slight modification to the cvs mail formats
moodler [Fri, 28 Dec 2007 03:21:52 +0000 (03:21 +0000)]
Automatic installer.php lang files by installer_builder (
20071228)
urs_hunkler [Thu, 27 Dec 2007 21:00:00 +0000 (21:00 +0000)]
merged from 1.9 :: MDL-12745 :: added class clearfix to "form-item" to stop div collapsing.