GitLab

This patch:
- adds an 'unsubscribetoken' column to usr_watchlist_view table
 (if we want to unsubscribe other messages we'd need to add an
'unsubscribetoken' to the relevant table)
- records the token when one watches the view
- sends email with unsubscribe link with message type and token to
avoid exposing any user data
- link goes to unsubscribe.php page and either unsubscribes user or
gives generic warning

Currently only working for watchlist notifications being sent via
email/email digest

Change-Id: I823249108f521faaefe3435f03b84ddf73e2d360
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

A new method is added to treat the institution lang when an
invitation is sent to the user.

behatnotneeded

Change-Id: I0da8d8341f0dc15f13db9f80dc6f560ca924df3c

Add 5 new new columns to event_log table make searching over the
data easier and also record the id of any parent/related info as well

Eg, if one deletes an image block from a page we now record:
id - the event id
resourceid - the block id
resourcetype - the blocktype, eg image
parentresourceid - the id of the parent, eg view id
parentresourcetype - the type of parent, eg 'view'

Because we would not be able to find related view info from just the
block id anymore.

Also added the ability to index and search over event information in
elasticsearch search type event_log

Change-Id: I280c1c75c35a6c58f42d8acb36cf5c24c70b902d
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

behatnotneeded

Change-Id: Ie2829f5b93b6d6dc2d85b5dc375dcc6e09f56e5d
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Some string IDs changed so that they are
picked up by the translators while others
aren't changed when they are just changes
for English.

behatnotneeded

Change-Id: I9afb8980492937f361e6e35361245c689b5a4413

If the page being shared is not currently available

behatnotneeded

Change-Id: Ia2cd63d1ce4371c89b02d3020128bf8c7a7de7e4
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Institutional admins should not have the "Contact us",
"Repeat virus upload" and "Virus flag release" fields available
in the Activity Preferences Notification settings.

They should have "Objectionable content" field available.

behatnotneeded

Change-Id: I52adf5ac1b9cc537ede78279128363eafab01453

For the activity_get_viewaccess_users() function to make it similar to
activity_get_users() so that we can have the correct remote url in the
email message.

behatnotneeded

Change-Id: If04d8f7ee8e5d0bb168774f206d4fb964bb53b12
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

The abstract Activity class defines the function update_url()
with no parameters, but the two subclasses that override it
define it with one parameter. This will cause problems in PHP 7.

It's always called with one parameter, (even in the Activity
class itself) so the best option is to add one parameter to the
implementation in Activity.

Change-Id: I810061ed6f8c55101327e2e907bb68ebf9870380
behatnotneeded: Covered by existing tests

- Change ownership of default system templates
 from user 0 to institution 'mahara'
 and set template to 2
- Enable to add site files into site templates

behatnotneeded - existing tests for system templates are ok

Change-Id: Idfd5fca423e6f6a5f66d6cf944f7c5f88112584c
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

behatnotneeded

Change-Id: I88af0659d0140fc9595b15ee3d0771e819e0dee1
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

If we have special chars like " or > in a feedback message they get
saved to db as htmlspecialchars like " or $gt;

When we go to display them we turn the & part into a specialchar again
leading to bad display.

Change-Id: Ie66dd599029f0939938f0d1d829c4156b5db6d56
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 884023

Change-Id: Ide9df8c7df229395fe4e3ae496a70fa9d4ffcab1

To change the plugin type from artefact to module, the code is moved and the
superclass reference is changed to PluginModule. Obsolete classes for the
former unused artefact types are deleted. The references to the old script
paths are changed. Plugin Tables are renamed and references updated.
The new plugin mustn't be installed when the old plugin is still active, but on
upgrade, the database tables are renamed and references in artefact_installed
and artefact_event_subscription and the triggers are changed.

Change-Id: Id5f1198b780ffb92181f7d60785aad9ffe2259da
Signed-off-by: Tobias Zeuch <tobias.zeuch@rwth-aachen.de>

To allow us to show a more detailed error message if site admin (not
belonging to the group) goes to review an objectionable group page
or group forum topic that has already been sorted out.

Change-Id: If4785528bfe29736542972adce7609cdb0522248
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I332f8f2ea0c317b5171fe9163912c760f6bc2c77

Bug 1411090: If a change to a view is big enough to trigger a
watchlist notification, we should go ahead and updated view.mtime

Change-Id: I70c23c210a7b711035de88d3a916f4847d156882

"Complaint relates to: [Link]" now goes straight to artefact instead of profile page of the reported user.

Change-Id: Idd7453e9a53094afa6f6951d3e2b1cc687d56eff

I fixed the bug number 1388682, which was the order of the notification
settings. The bug message asked to alphabetize the list of notification
settings, and I chose to fix it by alphabetizing the entire list instead
of spliting into sub headings.

Change-Id: Id74619db5c33638f0c29a2028eec94744dbb0b0d

Trying to list all pages that are changed in the notification email,
even when they are part of a collection.

Change-Id: I045a324b4ceb4892646a3f8210bef41806ebf5e0
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Adding a get_special_notifications function to allow for the adding of
special case notification options to non admin user's notifications list

Allowing the 'Objectionable content in forum' notification type to be
seen/set by forum moderators/admins

Change-Id: I69ab8b9de850345868346a85342f48d1f0b0f2aa
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 1380201

Change-Id: Ie9aa85fbfe244285322f82a0b06b8287424f50d1
Signed-off-by: Son Nguyen <sonn@catalyst.net.nz>

In this patch:
- Changed the Group Edit 'General' section and added the 'Feedback
notifications' options.
- Changed the Group Edit 'General' section and altered the 'Shared
page' option from tickbox to select options.
- Changed the CommentFeedback to be able to notify multiple users in a
group
- Changed the CommentFeedback to be able to send message in the
institution lang if needed.
- Adjusted group_get_editroles_options() to allow it to return a non
associative array
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Change-Id: Ia2e995c51aa08610945788e55c809b3c650dcd17

Content from the following commits was reverted:

Patch 3327: 7a7673c0
"Add activity stream block (Bug #1316324)"

Patch 3374: c538c745
"Add likes to activity streams (Bug #1321480)"

Patch 3432: 121e9027
"Add new parameters to the get_activity_body function (Bug #1328729)"

Patch 3434: 2e47dfb1
"Improvements to activity stream body helper (Bug #1328760)"

Change-Id: Id03c156a7c8c016c8dc76c998a73310ea57fe0a5
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>

Change-Id: Ie1c127c1677efef5ce3d48f2b187f91fc60837cb
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>

Change-Id: I178d811545ba527d3629491633042513a5b1c03d
Signed-off-by: Moises Burgos <moises.burgos@totaralms.com>

Change-Id: I689fb61b4f75c56dca0e1e400e74c14580afb133
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>

Change-Id: I49c15aed9e36da0ff4ea4e1fa4d110c112a25215
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>

As vetted in the May 2014 dev meeting
http://meetbot.mahara.org/mahara-dev/2014/mahara-dev.2014-05-01-08.01.log.html

Change-Id: I353ed74d69a5346fbe4e8e521e5c349dbe8dcbac

Bug 1318959: Add the shared pages title to the subject of the notification
for the new page access

Change-Id: I0d33442d707ac4554d79ac248075077763818475
Signed-off-by: Tobias Zeuch <tobias.zeuch@kit.edu>

Fixes in this patch:

- Moved artefact.php to artefacts directory to separate it from pages.
- Fixed reference to a wrong 'artefactonlyviewableinview' string.
- Removed add_to_render_path() and its calls which have no purpose at all.
- Removed 'artefact_parent_cache' table.
- Removed cron jobs related to 'artefact_parent_cache' from DB.
- Added 'path' column in 'artefact' table to easier calculate hierarchy.
- Added ArtefactTest.php for artefacts unit tests

Change-Id: Ia14cd85b94c32a950354446ee3565bd2964c625c
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>

So that we can later use them separately for artefact level access,
and report artefacts separately from pages.

When testing, everything should work as it worked before with
reporting objectionable material.

Also fixed "Creating default object from empty value" error
when ActivityTypeObjectionable object is constructed.

Change-Id: I6d95a5546b2425d9b522435da26902e420139d84
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>

- Each activity type can specify a default notification method. They default
  to 'email' to remain backwards compatible.
- Each activity type can specify if it is allowed to be set to 'none'. Defaults
  to 'allowed' for backwards compatibility.
- Removed 'required' from notification settings - it didn't make sense, and the
  change above deals with this in a better way.
- The site wide defaults for each activity type can be edited in
  Site options -> Notification settings. These are applied to new users or
  whenever a user does not have the appropriate usr_activity_preference records.
- Removed 'Default notification method' as it's functionality is now covered by
  the change above.
- There is a separate help next to each activity type to explain what messages
  will be affected by the setting.

Change-Id: I131cdeefbeaa8e43688aefd9d770fc8cb9bceea8
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>

Change-Id: I9d8a06061092796577a0caa023a51ea911dfad93

Change-Id: I87fc9ca86d814c407203b4f2c76c83c0cba765d5

Introducing a new plugin watchlistnotification that responds to the
events saveartefact, blockinstancecommit and deleteblockinstance. It
stores the changed view and the blockinstance in a table watchlist_queue
and checks via cron if there were any changes on a view and if for that
view the last change has happened some time ago (the minutes are stored
in config under watchlistnotification_delay, the default is 20min).

If so, a message is generated that informs the watchlist recipient about
which view and which block-instances on this view have been touched
(added or changed).

As there is no way to disable the built-in/old watchlist-notification-
system, this is disabled in the mahara-core code, that is,
artefact/lib.php and lib/view.php

Change-Id: I039c5285cdd1b09ed9eb38a647e0c1510c3cabb9
Signed-off-by: Tobias Zeuch <tobias.zeuch@kit.edu>

Get the correct owner info of a watched view in cases of group or
institution pages

Change-Id: I144f969a1cbe464892cc20a33fa6336928373278
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Change-Id: Ieb3f2d18befa2881d55aba1b8ff436eba1522c1c
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>

Problem with previous preg_replace regex was it only dealt with things
at the beginning of a line, whereas the extra <br> was at the end of
the lines.

Moved the preg_replace for <br> to be doen first.

Change-Id: Ie8ae09bf0981758f37cbe098be509f6a8540c325
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 778254

Change-Id: I273b347070266d2229159f838d0f7a061c63250b