poltawski [Wed, 9 Jan 2008 10:12:31 +0000 (10:12 +0000)]
MDL-12461 - wrong urls for message related log entries
merged from MOODLE_19_STABLE
moodler [Wed, 9 Jan 2008 07:36:29 +0000 (07:36 +0000)]
Fixed missing string MDL-12801
moodler [Wed, 9 Jan 2008 06:50:42 +0000 (06:50 +0000)]
Merged MDL-12801 from MOODLE_18_STABLE (improve roles terminology for system)
scyrma [Wed, 9 Jan 2008 04:10:02 +0000 (04:10 +0000)]
Small documentation fix.
ericmerrill [Wed, 9 Jan 2008 02:13:52 +0000 (02:13 +0000)]
MDL-11674
Changing back an issue that could cause dataloss.
mjollnir_ [Tue, 8 Jan 2008 23:27:45 +0000 (23:27 +0000)]
Merged from MOODLE_19_STABLE: MDL-12884 web installer should set the depth of the miscellaneous course category to 1 too (discussion in moodle hq skype chat with Petr)
mjollnir_ [Tue, 8 Jan 2008 23:23:19 +0000 (23:23 +0000)]
MDL-12884: cli installer should create the context for the Miscellaneous course category
martinlanghoff [Tue, 8 Jan 2008 22:36:17 +0000 (22:36 +0000)]
mod/chat:chat_cron() - IS NOT NULL is better - MDL-11674
poltawski [Tue, 8 Jan 2008 22:25:07 +0000 (22:25 +0000)]
MDL-12840 - gradebook CSV import was failing due to newlines with nothing
on them
merged from MOODLE_19_STABLE
martinlanghoff [Tue, 8 Jan 2008 20:58:24 +0000 (20:58 +0000)]
mod/chat:chat_cron() delete stale chat messages with a single query, fast, and portable too! MDL-11674
poltawski [Tue, 8 Jan 2008 20:20:36 +0000 (20:20 +0000)]
MDL-12882 - we were caching empty records which caused clone warnings
merged from MOODLE_19_STABLE
tjhunt [Tue, 8 Jan 2008 18:37:46 +0000 (18:37 +0000)]
MDL-12771 - change multianswer quetsion type HTML to more closely match that of other question types, in order to fix a layout glitch in Moodle 1.9.
tjhunt [Tue, 8 Jan 2008 18:29:20 +0000 (18:29 +0000)]
MDL-12785 - Partially correct tick icon not displayed for MULTICHOICE, single answer questions. Fix thanks to Joseph Rézeau. Merged from MOODLE_18_STABLE.
urs_hunkler [Tue, 8 Jan 2008 18:07:47 +0000 (18:07 +0000)]
merged from 1.9 :: MDL-12881 :: added class names "username" and "password" for better login form handling.
sam_marshall [Tue, 8 Jan 2008 17:30:50 +0000 (17:30 +0000)]
MDL-12876 Moved accesshide text further off the screen as it was sometimes visible
poltawski [Tue, 8 Jan 2008 16:47:19 +0000 (16:47 +0000)]
MDL-12464 - refine further so that glossary can't refer to instance from
another course (and cause breakage)
tjhunt [Tue, 8 Jan 2008 15:17:02 +0000 (15:17 +0000)]
MDL-12875 - Hidden courses not in category list not visible to teachers on those courses in the list of courses in a category.
tjhunt [Tue, 8 Jan 2008 15:04:00 +0000 (15:04 +0000)]
Put back DEBUG_DEVELOPER sanity check in has_capability, that makes sure the capabiltiy you are asking about actually exists. I know it takes an extra DB query, but it is DEBUG_DEVELOPER only, and it is worth its weight in gold, because otherwise you get really subtle bugs that take forever to diagnose. I know, I have just been banging my head against the wall for an hour.
poltawski [Tue, 8 Jan 2008 13:40:32 +0000 (13:40 +0000)]
MDL-9372 - only show RSS options in database module when RSS is enabled
merged from MOODLE_19_STABLE
poltawski [Tue, 8 Jan 2008 12:51:07 +0000 (12:51 +0000)]
MDL-10813 - Course requests not respecting course request category.
Also made the course request category more robust, as breakage would
incur if $CFG->defaultrequestcategory didn't exist as a category.
merged from MOODLE_19_STABLE
poltawski [Tue, 8 Jan 2008 12:00:11 +0000 (12:00 +0000)]
MDL-12873 - show an add course button when editing at the top level (which
is the default view when you click 'Add/Edit Courses')
merged from MOODLE_19_STABLE
skodak [Tue, 8 Jan 2008 07:33:48 +0000 (07:33 +0000)]
MDL-11830 width applied to input fields only, that should solve the incorrect size of button; merged from MOODLE_19_STABLE
skodak [Tue, 8 Jan 2008 07:16:18 +0000 (07:16 +0000)]
MDL-12869 fixed minor security problem in installer - reported by hanno; merged from MOODLE_19_STABLE
nicolasconnault [Tue, 8 Jan 2008 06:07:56 +0000 (06:07 +0000)]
Misplaced variable definition
martinlanghoff [Tue, 8 Jan 2008 04:13:32 +0000 (04:13 +0000)]
dmllib:rcache_set()/rcache_get() - use clone() function which we can support in PHP4 - MDL-12827
moodler [Tue, 8 Jan 2008 03:21:40 +0000 (03:21 +0000)]
Automatic installer.php lang files by installer_builder (
20080108)
iarenaza [Tue, 8 Jan 2008 00:13:49 +0000 (00:13 +0000)]
MDL-12858 fix print_error() usage.
print_error()'s third parameter is the URL we jump to (defaults to
$CFG->wwwroot if not set) when we click the 'Continue' button, not the message
string parameter object.
Forward ported from MOODLE_18_STABLE
poltawski [Mon, 7 Jan 2008 21:40:25 +0000 (21:40 +0000)]
MDL-12853 - fix typo
poltawski [Mon, 7 Jan 2008 21:30:18 +0000 (21:30 +0000)]
MDL-12866 - fix missing 'is' typo
poltawski [Mon, 7 Jan 2008 20:57:44 +0000 (20:57 +0000)]
MDL-12856 - previous commit was breaking moodle installs after
redeclaring method. Remove the duplicate function.
merged from MOODLE_19_STABLE
poltawski [Mon, 7 Jan 2008 20:32:16 +0000 (20:32 +0000)]
MDL-12859 - add some whitespace so translation layout doesn't get messed
up; merged from MOODLE_19_STABLE
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