Moving password encryption into create_user() (bug #799594) broke
new account emails for new Leap2a imported users, because Leap2a
users are reloaded from the database before the email is sent.

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

A couple of 'continue' statements look to be leftovers from a previous
version of this script that added users in a loop.  Now that they each
user is added with a redirect back to the page, we should do this
correctly after a failure to unzip or process a leap2a file.

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

In sql, null != 1 is not true.

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

* changes:
  Update user theme whenever a custom theme is submitted (bug #814354)
  Add checkbox to set configurable theme colours to default (bug #814354)

An institutional admin modifying configurable theme colours doesn't
immediately see the new colours unless they are also changing the
theme dropdown.

This change ensures the user's theme is reset whenever the institution
settings form is submitted with a custom theme.

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

* changes:
  Add quota check to extract to support group quotas
  Add group quota sidebar to extract page
  Add group quota recalculate to existing cron entry

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

Before when extracting, it only checked if a user owned the file and whether
they had sufficient quota left. This patch adds a check to check group quota
and also allows for easy addition for a check for institutional quota when such
a thing exists.

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

Also cleaned up an issue if you passed an artefact id of 0
Because of that, a lot of whitespace changed

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

Add a recalculate_group_quota function in the same way existing quotas do it
This allows other plugins to add to the quota as well.

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

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

Allows pages such as the following to work
http://prezi.com/yyursjqfcv-a/e-portfolios-big-progress-through-little-steps/
http://prezi.com/_vj1hqc7fsnh/moodle-and-mahara-at-ashs/



Note:
There could be more characters needed to support. I couldn't find info
on the prezi site on what sort of id's are allowed, so we might just need
to catch them when they occur.

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

For example, if you had an external block with the url
http://wikieducator.org/Shakespeare/Romeo_and_Juliet
then the old version would cut this off at
http://wikieducator.org/Shakespeare



This patch allows the URL to have /'s after the wikieducator.org/
allowing subpages to be viewed as external content

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

Happens when all the users institutions have selected at most
Institution only for displaying online users. If a user was in
more than one institution as another user, then the user was displayed
twice (or multiple times)

This patch adds a DISTINCT condition to the select statement, which only
displays the users once

Bug #794368

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

Basically when a page is viewed that has a blocktype of externalvideo
and doesn't have a type set, then call process_url and save the config
again.

This could be done as an upgrade path, but would mean a slow upgrade.
This patch does it on a on-view basis, and only does it the first time
the page is viewed

Bug #819079

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

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

Tell the admin why we can't be helpful and give them exact logo
dimensions.

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

The institution logo feature didn't allow institutional admins to
revert to the standard logo, so once they'd uploaded a logo, they
couldn't go back.

This adds a delete logo checkbox on the institution settings page.

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

Paginator.js expects replacement html returned from an ajax call to
be a string containing only table rows, which it then inserts into
an existing table on the page.

Recent updates to the myfriends block templates replaced the tables
with divs, breaking the pagination of the block.

This change modifies the paginator so that it can cope with divs as
well as tables.

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

Before it checked if the value was empty, which is true when
the value is 0. If this was the case, set it as default to 2

This patch checks instead if it is set, and only then sets the
default of 2. This allows you to select the option 0 (None)

Also makes sure that the online users block is not shown when
there are no users to display (ie, all institutions that the user
is in have None selected)

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

Issues were:
- extracting archives went to user quota (this was same as institution files)
-- fixed with institution files as well
- deleting folders didn't change the group quota

Issues still there:
- extract.php doesn't show group quota in side bar
- extract.php doesn't check if quota will be exceeded

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