GitLab

In commit 93c012f2

, the forum and group name were added to the body
of forum post email notifications, each wrapped in a call to
clean_html (htmlpurifier).  This crashes cron due to out-of-memory
errors whenever there are more than a few subscribers, and stops
notifications from being sent out at all.

The forum and group name only need to be rendered once per forum post,
so this could be fixed by moving the clean_html call up to the
activity constructor, rather than doing it in the get_emailmessage,
get_htmlmessage functions.  These functions get called for every
single subscriber notification, to ensure the string is displayed in
the subscriber's language.

But because group and forum names are never rendered as html, we don't
need to use htmlpurifier - html escaping is more appropriate and less
memory-hungry.

Change-Id: I0a4133b0a11e0e0004bdab1c29984ab4fc5dfbbf
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: I660fe25d3d9c08bf44dab0dd9a84410083666909
Signed-off-by: Rich Trott <rtrott@gmail.com>

Change-Id: Idd543e03aec6ee76ba34c5f66b0924a3bc3b3482
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Change-Id: Ib1bf2b37c73b948059c999f26b2bab556163170b
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Bug #911538

Change-Id: I10cfdb5f08e1e04f0e76b37d5937eed0a123a092
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

When we added the ability to map Student ID and Display from a LDAP
server, we completely forgot that the Student ID can be specific for
the institution. In fact, if we don't store the Student ID in
usr_institution we are not able to search for the user in the
institution users page using the Studend ID.

Full credit goes to Patrick Pollet for discovering the bug and
proposing a fix for it.

Change-Id: I545bbcb5addf837364ed1178be340d170d4114e3
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>

Bug 920183

I also replaced the deprecated "getVerifiedEmail()" function with
the new name for it: get()

Change-Id: I1488a17a34d62554967e7907b130ba180d89e40b
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

* changes:
  Use file_mime_type when creating audio/video artefacts
  Ensure filetype is set when creating new file artefacts (bug #914574)

* changes:
  Use type=profileiconbyid in more requests for thumb.php
  Fetch profileicon id info along with users in more places

These images include replacements for all the previously
untranslatable blocktype icons, homepage info graphics, and the
add/remove column buttons.

Change-Id: I02bde970a616782b2a97335f7876fe43a6cb0815
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Changed string 'noblogfound' to 'nodefaultblogfound'
to add link '<a href="%saccount/">account settings</a>'

Changed htdocs/artefact/blog/view/index.php to use
'die_info' instead of 'ArtefactNotFoundException'
so that the account settings link is not escaped

Change-Id: I517aeabba59373ccb19a1cd618a988af689ce0f2
Signed-off-by: Jono Mingard <reason.koan@gmail.com>

When editing a file the text "Enter comma separated
tags for this item. Items tagged with 'profile' are
displayed in your sidebar." now displays under the
tag textbox.

Added a new table row with the language string
'tagsdescprofile' to artefact/file/theme/raw/form/editfile.tpl

Change-Id: I2d3a0f92f989fca2bb990c9888a79ce090342cb3
Signed-off-by: Jono Mingard <reason.koan@gmail.com>

When you delete an institution, and one of the institution's
authinstances is still in use by some users, you get an sql error and
a nonrecoverable error screen. (This can only happen when the users
still using the authinstance are not institution members, because
there is already a check to stop deletion of institutions with
members).

This patch allows the institution to be deleted anyway, reassigning
the offending users to a 'default' authinstance.  If we can't find a
sensible default authinstance, it will at least display a more helpful
error message.

Also, when attempting to delete an institution with members, set an
error on the form rather than throwing a ConfigException.

Change-Id: I9c85a3c8c80411e3cf526767b9142efb12907e5c
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

To allow for pages that are accessible by both admins and staff, two
new constants are added, STAFF and INSTITUTIONALSTAFF.  The existing
checks for admin and institutional admin permissions are moved into a
new function which also takes account of the new staff permissions.

Change-Id: I60de6f74bd5f2a208be8e15e8a71f16b689c80d6
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

This can help to reduce the overall number of requests for thumb.php
because the 'profileiconbyid' urls are cached for longer by the
browser.

(Where the profile_icon_url function can be used, we also avoid the
need to generate additional requests for users without profileicons,
when remote avatars are disabled.  But because profile_icon_url relies
on the nouserphoto icon being available in the requested size, we
can't use it everywhere until we either generate the nouserphoto icon
in more sizes, or change all those pages to use standard sizes.)

Change-Id: I81c5c5f4b7f9136bf9b6a6f711e55a4bceb6fa14
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

On the admin notifications page, and in the wall and recent forum
posts blocks, we are fetching user information from the database and
then subsequently generating new requests for their profile icons.

By fetching the profileicon and email address along with the rest of
the user information, we will be able to avoid the need for these
additional requests in many cases.

Change-Id: I82cbf378ace2e663d0958529aeb2f3b123364caa
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When a user is deleted, deletion of notification_internal_activity
records can fail with a foreign key error when another row in
notification_internal_activity has a parent field pointing to one of
the records we are trying to delete.  This is fixed by setting the
parent fields to null before deletion.

The handle_event('deleteuser') call in delete_user is also moved
inside the transaction, to ensure that deleted users will have their
notifications deleted correctly.  Other subscribers to the deleteuser
event in core should be unaffected.

Change-Id: Ibc0a695e986bb175a00441f02d3e40abf38cbcde
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Audio and video artefacts are created according to the mimetype
claimed by the browser: no checking is currently performed on the
file's content.  This doesn't really matter because these artefact
types are only used to display special audio/video icons in the files
area, but we may want to use them for other purposes later.  Until we
can ensure these files are valid, and that Mahara can play them, we
should at least use the slightly more accurate detection provided by
file_mime_type.

This patch also renames the new_<artefacttype> artefact type detection
functions so that they are consistent for audio, video, and archive
artefacts.  It also removes the unnecessary archive_from_file()
function in the archive class, combining it into the detection
function.

Change-Id: I6ec5ae0c18a3fae4c6cdb609097173432ca0c57f
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When a new file artefact is created from a file that wasn't uploaded
by a browser, the filetype property is not always set.  This causes
warnings when extracting files from archives.  Moving the call to
file_mime_type right before construction of the new artefact type
fixes the problem and allows us to remove some other calls to
file_mime_type during import and upload.

Change-Id: I8e644bfc1e6bc0fbaa90f1e6637288997b0d028c
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Added class to bloglist.tpl and css to style.css
to prevent the new entry button from being squashed and not displaying on one line.

Bug#874002

Change-Id: Id1e7029d2593cb247a425a2cde363ae580d9b240
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>

This commit changes a couple of places where it's possible to check
for installed plugins using plugins_installed() instead of a new db
query.

Change-Id: I3e769a0858d8db776bf7d8e14102c49b5b9f7b07
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: I79ced22f29ace3e4a566cb53d8ec6c2784376c56
Signed-off-by: Francois Marier <francois@catalyst.net.nz>