mahara:mahara.git
11 years agoexternalvideo: Added support for various media sources
Brett Wilkins [Thu, 2 Jun 2011 09:44:35 +0000 (21:44 +1200)]
externalvideo: Added support for various media sources

Have added support for various media sources, which neccessitated the ability to support
iframes and page scraping for certain sources but not others. for this reason, I have broken
the sources out into their own classes, all implementing a common interface. This also
allows later additions to the sources to be added more easily.

Unfortunately language strings still need to be kept in the same place.

Other changes include the ability to set the width/height parameters as percentage values,
should the source need to be able to support that.

Change-Id: I802ffa8d8cf1172c9c45d1b71822d0d99c57b480
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoMerge "Fix autogen of wwwroot to detect symbolic links correctly"
Francois Marier [Tue, 7 Jun 2011 01:45:59 +0000 (13:45 +1200)]
Merge "Fix autogen of wwwroot to detect symbolic links correctly"

11 years agoFix autogen of wwwroot to detect symbolic links correctly
Hugh Davenport [Wed, 11 May 2011 02:12:05 +0000 (14:12 +1200)]
Fix autogen of wwwroot to detect symbolic links correctly

Test by appending each directory in PHP_SELF to DOCUMENT_ROOT
when the realpath of that is the same as dirname(__FILE__) then
stop processing.

For most users there is little performance hit, only a few will
have more than say two levels above DOCUMENT_ROOT

If nothing can be autoconfigured, use a default of root (ie no
path)

Bug #780237

Change-Id: I60339a180ac043ab0b89c3a49ff5f2485112f567
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Change order of edit page navigation bar"
Francois Marier [Mon, 6 Jun 2011 23:33:38 +0000 (11:33 +1200)]
Merge "Change order of edit page navigation bar"

11 years agoMerge "tinymce: disable autoresize plugin (bug #791854)"
Francois Marier [Mon, 6 Jun 2011 23:20:10 +0000 (11:20 +1200)]
Merge "tinymce: disable autoresize plugin (bug #791854)"

11 years agoMerge "Adjust method to allow specification of forums to get topics for"
Francois Marier [Mon, 6 Jun 2011 23:19:30 +0000 (11:19 +1200)]
Merge "Adjust method to allow specification of forums to get topics for"

11 years agotinymce: disable autoresize plugin (bug #791854)
Francois Marier [Sat, 4 Jun 2011 04:57:15 +0000 (16:57 +1200)]
tinymce: disable autoresize plugin (bug #791854)

The auto-resize plugin is currently broken in Chrome:

  http://tinymce.moxiecode.com/develop/bugtracker_view.php?id=4416

This effectively reverts 5525cb60742b19a475cdbd824c5cd567639fabd8
and reopens bug #530656.

Change-Id: I2729dec02247ea1eb3d5d10f9a4f4a8bf93f1b52
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
11 years agoMerge changes Ibf3847ca,I37a455d7,I3da189b7
Ruslan Kabalin [Fri, 3 Jun 2011 11:10:01 +0000 (23:10 +1200)]
Merge changes Ibf3847ca,I37a455d7,I3da189b7

* changes:
  Add copy collection to copy page page
  Collection preview
  Initial support for copying collections

11 years agoAdd copy collection to copy page page
Hugh Davenport [Thu, 2 Jun 2011 03:06:20 +0000 (15:06 +1200)]
Add copy collection to copy page page

Change-Id: Ibf3847cac7ed1905146360ab72e81df14a3faaa2
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoCollection preview
Hugh Davenport [Thu, 2 Jun 2011 02:47:47 +0000 (14:47 +1200)]
Collection preview

Change-Id: I37a455d728b5b162ac5c82a73b813f45a1e78d77
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoAdjust method to allow specification of forums to get topics for
Darryl Hamilton [Thu, 26 May 2011 23:52:52 +0000 (11:52 +1200)]
Adjust method to allow specification of forums to get topics for

This change allows you to specify an array of forum ids, from which
active topics are returned.

Used in the sitemap generation code to limit topics to forums attached
to public groups.

Change-Id: Ibe849e844b3a229c427a554f641373d3911be225
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoInitial support for copying collections
Hugh Davenport [Thu, 2 Jun 2011 02:38:59 +0000 (14:38 +1200)]
Initial support for copying collections

Code adapted from /lib/view.php

Change-Id: I3da189b7f3391c34ec53e3755b119f9c3fd1c9f9
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Restore edit membership link on find friends page (bug #791688)"
Richard Mansfield [Thu, 2 Jun 2011 06:14:13 +0000 (18:14 +1200)]
Merge "Restore edit membership link on find friends page (bug #791688)"

11 years agoMerge "Fix sql error on find friends page (bug #791681)"
Richard Mansfield [Thu, 2 Jun 2011 06:14:02 +0000 (18:14 +1200)]
Merge "Fix sql error on find friends page (bug #791681)"

11 years agoRestore edit membership link on find friends page (bug #791688)
Richard Mansfield [Thu, 2 Jun 2011 05:43:42 +0000 (17:43 +1200)]
Restore edit membership link on find friends page (bug #791688)

This bug was introduced by commit c243ea697d (see bug #619115).

Change-Id: Ic144d4b351a33a05d059a843d3c94811eed78d27
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoFix sql error on find friends page (bug #791681)
Richard Mansfield [Thu, 2 Jun 2011 05:19:04 +0000 (17:19 +1200)]
Fix sql error on find friends page (bug #791681)

Change-Id: I8dd6f820d64fe69c69eaa265e3264ff1f908bc6d
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoUpgrade TinyMCE from 3.3.8 to 3.4.2 (bug #750815)
Darryl Hamilton [Fri, 29 Apr 2011 01:55:17 +0000 (13:55 +1200)]
Upgrade TinyMCE from 3.3.8 to 3.4.2 (bug #750815)

This includes updated language packs, and removal of the
media plugin (see c5c0cf7b9454ddfed516ae0c6b6e8345f9503620).

Change-Id: Iec45662f9ae9dac42b09ac9a240160ac06e3e998
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoMerge "Fix bug with institutional quotas"
Francois Marier [Thu, 2 Jun 2011 04:35:58 +0000 (16:35 +1200)]
Merge "Fix bug with institutional quotas"

11 years agoFix bug with institutional quotas
Hugh Davenport [Thu, 2 Jun 2011 04:12:25 +0000 (16:12 +1200)]
Fix bug with institutional quotas

The code to automatically get the default quota did
not do the following:
- Check if user was site admin
- Return json requests correctly

This patch fixes these bugs

Introduced in the following commit
cc8c6d0d931709765b94917a97ff1aba876d60b9

Change-Id: Id35b489eeacf19ea56a35585b3aa6bb9d82d54f3
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Update user info on login can prevent re-login if a LDAP attribute is empty."
Francois Marier [Thu, 2 Jun 2011 00:15:30 +0000 (12:15 +1200)]
Merge "Update user info on login can prevent re-login if a LDAP attribute is empty."

11 years agoAdd group quotas
Hugh Davenport [Mon, 23 May 2011 00:48:47 +0000 (12:48 +1200)]
Add group quotas

Change-Id: Id4880764ab395ea56395a57f52258968097bb02b
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoUpdate user info on login can prevent re-login if a LDAP attribute is empty.
Iñaki Arenaza [Tue, 31 May 2011 21:00:24 +0000 (23:00 +0200)]
Update user info on login can prevent re-login if a LDAP attribute is empty.

If the LDAP attribute is empty, some LDAP servers don't return the attribute in
the answer (as an empty value). This means the missing attribute is not present
in the $ldapdetails array returned by get_userinfo_ldap(). If we try to compare
the missing entry with the existing user value, they are always different
(unless the existing entry was also empty). Which means we assign an empty value
to the user profile field (which is not allowed by the db).

Simply testing if the LDAP attribute has been retrieved and is not empty before
making the comparison fixes the problem.

Tested with both MS AD (on W2003) and OpenLDAP 2.4.23 (on Debian).

Fixes bug #656679 (which also fixes bug #788029)

Change-Id: I81b59114b7fedeb8b575738b21ca4d6fd2670532
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
11 years agoMerge "Fix issue with collections when page is outside shown range"
Francois Marier [Wed, 1 Jun 2011 06:13:40 +0000 (18:13 +1200)]
Merge "Fix issue with collections when page is outside shown range"

11 years agoMerge "Add institutional override for user quotas"
Francois Marier [Wed, 1 Jun 2011 06:08:32 +0000 (18:08 +1200)]
Merge "Add institutional override for user quotas"

11 years agoAdd institutional override for user quotas
Hugh Davenport [Mon, 23 May 2011 00:41:44 +0000 (12:41 +1200)]
Add institutional override for user quotas

Also add in default quota for each institution

Change-Id: Ibfdd5a10990e9c6a936b9ad5921f734df1f5c805
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Fix link on export page (bug #790466)"
Francois Marier [Wed, 1 Jun 2011 05:46:10 +0000 (17:46 +1200)]
Merge "Fix link on export page (bug #790466)"

11 years agoFix link on export page (bug #790466)
Hugh Davenport [Tue, 31 May 2011 03:39:21 +0000 (15:39 +1200)]
Fix link on export page (bug #790466)

Change-Id: Ia8376964f279c368779fa78dc137adf3041cbeb4
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Move forum list code into function"
Francois Marier [Wed, 1 Jun 2011 04:43:38 +0000 (16:43 +1200)]
Merge "Move forum list code into function"

11 years agoMerge "Allow anon users to view public forum topics"
Francois Marier [Wed, 1 Jun 2011 04:41:14 +0000 (16:41 +1200)]
Merge "Allow anon users to view public forum topics"

11 years agoMerge "Add last post edit time to forum topic information"
Francois Marier [Wed, 1 Jun 2011 04:39:29 +0000 (16:39 +1200)]
Merge "Add last post edit time to forum topic information"

11 years agoFix error log on creating new forum (bug #788951)
Hugh Davenport [Tue, 31 May 2011 23:34:47 +0000 (11:34 +1200)]
Fix error log on creating new forum (bug #788951)

Change-Id: Ic2ff7a9e2b836dfaedead7a4be002dccdc528ac2
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Fix bug when updating access with no views"
Francois Marier [Tue, 31 May 2011 05:12:25 +0000 (17:12 +1200)]
Merge "Fix bug when updating access with no views"

11 years agoMerge "Update the session language on change of user preference"
Richard Mansfield [Tue, 31 May 2011 03:38:04 +0000 (15:38 +1200)]
Merge "Update the session language on change of user preference"

11 years agoMerge changes Icf28f531,I310bed95,I058f3a1a,I6cf82916
Richard Mansfield [Tue, 31 May 2011 03:37:47 +0000 (15:37 +1200)]
Merge changes Icf28f531,I310bed95,I058f3a1a,I6cf82916

* changes:
  Add 'My institutions' filter drop-down to find friends page
  Add institutions filter to pagination links in search results
  Add institutions filter to user search query
  Add institution filter parameter to user search page

11 years agoMerge "Pull all the mimetypes from db in one hit when trying to identify files"
Richard Mansfield [Tue, 31 May 2011 03:36:31 +0000 (15:36 +1200)]
Merge "Pull all the mimetypes from db in one hit when trying to identify files"

11 years agoMerge "Fix error log when importing from moodle via leap"
Francois Marier [Tue, 31 May 2011 03:24:52 +0000 (15:24 +1200)]
Merge "Fix error log when importing from moodle via leap"

11 years agoMerge "Adding SlideShare iframe filter"
Francois Marier [Tue, 31 May 2011 03:23:11 +0000 (15:23 +1200)]
Merge "Adding SlideShare iframe filter"

11 years agoFix error log when importing from moodle via leap
Hugh Davenport [Tue, 31 May 2011 02:12:56 +0000 (14:12 +1200)]
Fix error log when importing from moodle via leap

Bug #789719

Before the data was imported, but there was an error log, and now
the data imports but with no error log.

Change-Id: If724d33dafc19bfe42721f6ff81b8a7dfd83b0ef
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoUpdate the session language on change of user preference
Richard Mansfield [Mon, 30 May 2011 21:28:56 +0000 (09:28 +1200)]
Update the session language on change of user preference

When a user changes their language preference, this change ensures
that the session language is also updated at the same time.

This means the user language is retained when the user logs out,
and in the case where they remove their language preference
altogether, the session language (which is normally used in
preference to the site default) is cleared too.

Change-Id: I29236709643ce95586900b1ea4f75c69bf1a33d4
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoMerge "Updating access to zero pages throws error"
Francois Marier [Mon, 30 May 2011 03:11:48 +0000 (15:11 +1200)]
Merge "Updating access to zero pages throws error"

11 years agoMerge "Fix display issue with groupviews blocktype"
Francois Marier [Sun, 29 May 2011 23:51:27 +0000 (11:51 +1200)]
Merge "Fix display issue with groupviews blocktype"

11 years agoUpdating access to zero pages throws error
Hugh Davenport [Fri, 27 May 2011 02:41:10 +0000 (14:41 +1200)]
Updating access to zero pages throws error

This fix makes it only update access if there is something
to update

Bug #788457

Change-Id: If0775025ffffcd4e60086693bc616b7fd73a39a9
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Make group info box not display a title"
Francois Marier [Fri, 27 May 2011 01:56:01 +0000 (13:56 +1200)]
Merge "Make group info box not display a title"

11 years agoAdding SlideShare iframe filter
Brett Wilkins [Tue, 24 May 2011 04:28:37 +0000 (16:28 +1200)]
Adding SlideShare iframe filter

Slideshare is a service for hosting and sharing slideshows
More at http://www.slideshare.net

Change-Id: I35f3aa138da4833a7f230d767730cecf03a11d18
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoMerge "Fix lang string 'canteditdontown' for certain sections"
Francois Marier [Fri, 27 May 2011 00:23:07 +0000 (12:23 +1200)]
Merge "Fix lang string 'canteditdontown' for certain sections"

11 years agoFix lang string 'canteditdontown' for certain sections
Hugh Davenport [Wed, 25 May 2011 00:06:18 +0000 (12:06 +1200)]
Fix lang string 'canteditdontown' for certain sections

Most of these get_string calls were not using a section
name. This patch fixes this by adding these strings to
each section responsible.

Bug #787866

Change-Id: I81ec38d7572f9472cf54885d6b35d542b933bca6
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Fix find groups page to show correct buttons"
Francois Marier [Fri, 27 May 2011 00:16:59 +0000 (12:16 +1200)]
Merge "Fix find groups page to show correct buttons"

11 years agoMerge "Fix directory permissions on uploadmanager"
Richard Mansfield [Thu, 26 May 2011 23:31:47 +0000 (11:31 +1200)]
Merge "Fix directory permissions on uploadmanager"

11 years agoMerge "Fix fatal error when checking access of group or institutional pages"
Richard Mansfield [Thu, 26 May 2011 23:23:14 +0000 (11:23 +1200)]
Merge "Fix fatal error when checking access of group or institutional pages"

11 years agoAdd 'My institutions' filter drop-down to find friends page
Richard Mansfield [Thu, 26 May 2011 22:58:05 +0000 (10:58 +1200)]
Add 'My institutions' filter drop-down to find friends page

Change-Id: Icf28f531ed0691b3e5b9da12bf042ea60107fbc8
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd institutions filter to pagination links in search results
Richard Mansfield [Thu, 26 May 2011 22:52:28 +0000 (10:52 +1200)]
Add institutions filter to pagination links in search results

When the myinstitutions filter option is passed to build_userlist_html,
make sure the filter is propagated to the query string in the pagination
links at the bottom of the search results.

Also removes unused variables from the smarty template.

Change-Id: I310bed95529160c1592fae48398d1b491382444d
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd institutions filter to user search query
Richard Mansfield [Thu, 26 May 2011 22:50:25 +0000 (10:50 +1200)]
Add institutions filter to user search query

If the 'myinstitutions' option is passed to search_user(), add an
institution subselect to the query so that only users sharing an
institution with the logged-in user are returned.

Change-Id: I058f3a1ab4921da6faa934aebebd0a3f2d2d18c8
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd institution filter parameter to user search page
Richard Mansfield [Thu, 26 May 2011 23:09:35 +0000 (11:09 +1200)]
Add institution filter parameter to user search page

On find friends page and associated json script, take a 'filter' param
and pass it through to both the search function and the pagination
builder.

The only valid options will be 'myinstitutions' (to filter results by
users who are in one or more of the logged-in user's institutions),
and 'all', to search everyone on the site.

The new parameter defaults to 'all' when the logged-in user is not in
any institutions.

Change-Id: I6cf829162bc0374ef63fa6848bd7f00755050bcc
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoFix display issue with groupviews blocktype
Hugh Davenport [Thu, 26 May 2011 05:54:59 +0000 (17:54 +1200)]
Fix display issue with groupviews blocktype

When not configured, it doesn't use the default values

Bug #787444

Change-Id: I0274986fc40d418ecf8d876bf811796e18b53e4c
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoFix directory permissions on uploadmanager
Hugh Davenport [Thu, 26 May 2011 05:05:20 +0000 (17:05 +1200)]
Fix directory permissions on uploadmanager

Bug #788124

Change-Id: I56ac380aa8865fee5b676b989f6c100007f1d70b
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoFix fatal error when checking access of group or institutional pages
Hugh Davenport [Thu, 26 May 2011 04:37:34 +0000 (16:37 +1200)]
Fix fatal error when checking access of group or institutional pages

Bug #788460

Change-Id: Ib39b2d91bfa2cde4295a864e2efcbb9b9b39c709
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Implementing maximum width/height for WikiEducator filter"
Francois Marier [Thu, 26 May 2011 04:27:06 +0000 (16:27 +1200)]
Merge "Implementing maximum width/height for WikiEducator filter"

11 years agoMerge "Adding Glogster iframe filter"
Francois Marier [Thu, 26 May 2011 04:22:31 +0000 (16:22 +1200)]
Merge "Adding Glogster iframe filter"

11 years agoMake group info box not display a title
Hugh Davenport [Thu, 26 May 2011 02:51:03 +0000 (14:51 +1200)]
Make group info box not display a title

Bug #785760

Change-Id: I920ed50add97887a7800f99b88cee4d3216ddcf6
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Change default institution for CSV user creation when site admin"
Richard Mansfield [Thu, 26 May 2011 03:54:31 +0000 (15:54 +1200)]
Merge "Change default institution for CSV user creation when site admin"

11 years agoMerge "Change default file quota to be 50MB everywhere"
Richard Mansfield [Thu, 26 May 2011 02:43:12 +0000 (14:43 +1200)]
Merge "Change default file quota to be 50MB everywhere"

11 years agoMerge changes I49c53ac6,I74c229a4,I64449174,Ie46e9d05,I3a409149,I9ffb6ce0,I439501b3...
Richard Mansfield [Thu, 26 May 2011 02:08:27 +0000 (14:08 +1200)]
Merge changes I49c53ac6,I74c229a4,I64449174,Ie46e9d05,I3a409149,I9ffb6ce0,I439501b3,I3b885fcb,If6294c56

* changes:
  Remove old public_fields() functions from internal artefact & search plugins.
  Add more detail to help & description of mandatory & searchable fields
  Add config and help item for exact user search option
  Interpret double-quoted phrases in user search queries as single terms
  Simplify user search query
  Add usr table indexes for faster searches
  Reduce the number of searchable profile fields
  Fix warning when no values are submitted to checkboxes element
  Make checkboxes pieform element work with disabled checkboxes

11 years agoChange default file quota to be 50MB everywhere
Hugh Davenport [Thu, 26 May 2011 01:22:30 +0000 (13:22 +1200)]
Change default file quota to be 50MB everywhere

Bug #786783

Change-Id: Iae7e03e15caf0bd9ac8cfa5f6c7174878abfb7a3
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoTrim usernames when requesting login
Hugh Davenport [Thu, 26 May 2011 01:10:48 +0000 (13:10 +1200)]
Trim usernames when requesting login

Through both manual login and mobileuploads

Bug #787313

Change-Id: I709d2de9644142bd5f6c78f1e0d7ba451f99de40
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoRemove old public_fields() functions from internal artefact & search plugins.
Richard Mansfield [Tue, 24 May 2011 06:27:24 +0000 (18:27 +1200)]
Remove old public_fields() functions from internal artefact & search plugins.

Change-Id: I49c53ac628f77b99507436fedec938097d54f7d7
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd more detail to help & description of mandatory & searchable fields
Richard Mansfield [Tue, 24 May 2011 06:04:04 +0000 (18:04 +1200)]
Add more detail to help & description of mandatory & searchable fields

Change-Id: I74c229a498e9b1dbfd9bbaa09f8cc5f219e42b48
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd config and help item for exact user search option
Richard Mansfield [Wed, 25 May 2011 05:52:09 +0000 (17:52 +1200)]
Add config and help item for exact user search option

Change-Id: I644491740622d242677c06bb24779e676ad93838
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoInterpret double-quoted phrases in user search queries as single terms
Richard Mansfield [Tue, 24 May 2011 23:19:25 +0000 (11:19 +1200)]
Interpret double-quoted phrases in user search queries as single terms

Change-Id: Ie46e9d05ee6f7774be604f1ba8d35c0feddfa00d
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoSimplify user search query
Richard Mansfield [Tue, 24 May 2011 01:26:19 +0000 (13:26 +1200)]
Simplify user search query

Use the searchable profile fields from the internal artefact instead
of the 'public' fields.  Because these are all fields from the usr table,
this the join on the artefact table to be removed, and the same query can
then be used for both postgres and mysql.

Use either = or ILIKE to match fields depending on the value of the
'exactusersearch' config option.  Use of = allows the lowercase index to
be used in postgres searches.

Change the query to AND the search terms together instead of using OR.

Change-Id: I3a409149ee413fe59060e4e507ce58e34ebeb115
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdd usr table indexes for faster searches
Richard Mansfield [Wed, 25 May 2011 23:55:36 +0000 (11:55 +1200)]
Add usr table indexes for faster searches

Search is much faster in Postgres with these indexes on the lowercase
profile fields.

In MySQL we can't create the indexes without changing the types of the
column from text to varchar.  An upgrade to do this would have to be
destructive, and would require admin notification.  It's not worth doing
that, because MySQL cannot create indexes on functions of columns,
and we could not create the lowercase indexes that would be useful for
user searches.

Change-Id: I9ffb6ce02a5f3e8fc2cf158424b37b754edd8d34
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoReduce the number of searchable profile fields
Richard Mansfield [Mon, 23 May 2011 06:22:58 +0000 (18:22 +1200)]
Reduce the number of searchable profile fields

Change 'Public' to 'Searchable' in internal artefact config, because
that is now a more accurate description of what they are.

Reduce the allowed searchable fields to name, email & student id,
because these are the only fields returned in search users anyway.

Use checkboxes elements rather than multicolumntable to avoid a long
list of mostly disabled checkboxes under 'Searchable'.

Change-Id: I439501b30735ca899bc051f3bda79a2d272cdf45
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoFix warning when no values are submitted to checkboxes element
Richard Mansfield [Mon, 23 May 2011 06:04:42 +0000 (18:04 +1200)]
Fix warning when no values are submitted to checkboxes element

Change-Id: I3b885fcba5faf7fc86e0722c427c9061073f8f07
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoMake checkboxes pieform element work with disabled checkboxes
Richard Mansfield [Mon, 23 May 2011 05:59:19 +0000 (17:59 +1200)]
Make checkboxes pieform element work with disabled checkboxes

Values for disabled checkboxes are not passed in as post vars, so
the checked property needs to be reset every time the form is
submitted & rebuilt.

Fix the select all/none links to leave disabled checkboxes alone.

Change-Id: If6294c561c770f9a8bf82c17d826d7c569e34748
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoAdding Glogster iframe filter
Brett Wilkins [Tue, 24 May 2011 02:54:23 +0000 (14:54 +1200)]
Adding Glogster iframe filter

Glogster is an interactive poster creation and hosting service.
More at http://www.glogster.com

Change-Id: Ibb58cc08f6aaad55061f43eba447d8835c9ea2af
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoFix find groups page to show correct buttons
Hugh Davenport [Tue, 24 May 2011 23:52:18 +0000 (11:52 +1200)]
Fix find groups page to show correct buttons

Bug #787359

SQL code adapted from group_get_associated_groups
function in /lib/group.php (1190)

Change-Id: I6ff2be45b26eb89c57a079ca4c895ce894b2472f
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoImplementing maximum width/height for WikiEducator filter
Brett Wilkins [Wed, 25 May 2011 04:22:42 +0000 (16:22 +1200)]
Implementing maximum width/height for WikiEducator filter

Implementing this in aid of preventing users from breaking the layout of a page.

Change-Id: I9a694105f857db187445028a24a0b93023e445cd
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoPull all the mimetypes from db in one hit when trying to identify files
Richard Mansfield [Wed, 25 May 2011 07:08:26 +0000 (19:08 +1200)]
Pull all the mimetypes from db in one hit when trying to identify files

This will be useful when we introduce more file artefact types such as
audio and video files, each of which will need to have its mimetype
checked on every file upload.

Change-Id: I7b5aa141687d2093d1b55f96f10c80167f37133a
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
11 years agoBump the version number on master to 1.5dev
Francois Marier [Wed, 25 May 2011 04:08:07 +0000 (16:08 +1200)]
Bump the version number on master to 1.5dev

Change-Id: If92eb06f7a2864de278f929b9301eba9023d864f
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
11 years agoMerge "Timezone offset can start with a '-' (Bug #787262)"
Richard Mansfield [Wed, 25 May 2011 03:29:56 +0000 (15:29 +1200)]
Merge "Timezone offset can start with a '-' (Bug #787262)"

11 years agoChange default institution for CSV user creation when site admin
Hugh Davenport [Mon, 23 May 2011 00:26:57 +0000 (12:26 +1200)]
Change default institution for CSV user creation when site admin

Change-Id: I942af2136aaf82c68d260c10ccfb4d3725c359da
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "Fix filebrowser changing owner when multiple exist"
Richard Mansfield [Wed, 25 May 2011 01:55:41 +0000 (13:55 +1200)]
Merge "Fix filebrowser changing owner when multiple exist"

11 years agoTimezone offset can start with a '-' (Bug #787262)
Hugh Davenport [Tue, 24 May 2011 23:26:44 +0000 (11:26 +1200)]
Timezone offset can start with a '-' (Bug #787262)

Change-Id: Ic74a8978bc60501e5392b03a864423f75e658576
Signed-off-by: Rich Trott <Richard.Trott@ucsf.edu>
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoMerge "blocktype/externalvideo: Adding glogster embed support"
Francois Marier [Tue, 24 May 2011 07:57:40 +0000 (19:57 +1200)]
Merge "blocktype/externalvideo: Adding glogster embed support"

11 years agoMerge changes I7f554bcd,Ie3758aa8
Francois Marier [Tue, 24 May 2011 05:17:49 +0000 (17:17 +1200)]
Merge changes I7f554bcd,Ie3758aa8

* changes:
  Set ctime on changes to view_access
  Add ctime field to view_access including upgrade

11 years agoMove forum list code into function
Darryl Hamilton [Tue, 24 May 2011 03:56:49 +0000 (15:56 +1200)]
Move forum list code into function

Move the code block to get a list of forums in
the specified group into a function so it can
be used elsewhere (eg sitemap generation)

Change-Id: Ic73b91de632513851d7f7e634fadcf3b219ca0cf
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoSet ctime on changes to view_access
Darryl Hamilton [Tue, 17 May 2011 23:31:27 +0000 (11:31 +1200)]
Set ctime on changes to view_access

Change-Id: I7f554bcd11797d5b458d9f29a0becadb9ed3e8a3
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoAdd ctime field to view_access including upgrade
Darryl Hamilton [Tue, 24 May 2011 04:13:34 +0000 (16:13 +1200)]
Add ctime field to view_access including upgrade

Change-Id: Ie3758aa8a5b07036ac496e0aea3fae944307ed22
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoblocktype/externalvideo: Adding glogster embed support
Brett Wilkins [Tue, 24 May 2011 03:45:49 +0000 (15:45 +1200)]
blocktype/externalvideo: Adding glogster embed support

This is the externalvideo counterpart to the iframe filter for glogster.
Glogster is an interactive poster creation and hosting service.
More at http://www.glogster.com

Note: This does not support glogster iframes itself, as there is not enough
information provided to construct a working embedded object from.

Change-Id: I0372d7933f97e0c70aa250cd7fd26adda854b37a
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoAdd last post edit time to forum topic information
Darryl Hamilton [Tue, 24 May 2011 03:37:22 +0000 (15:37 +1200)]
Add last post edit time to forum topic information

This patch adds the edit time of the last post in a forum
topic to the returned information.

Change-Id: I9800aba69570637ac4e606dccc354f005bf0ca99
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoAdding foreign language support to supported list
Brett Wilkins [Tue, 24 May 2011 03:33:48 +0000 (15:33 +1200)]
Adding foreign language support to supported list

Change-Id: I76ee0f3f6f4f485ac659f5cd21667fde016b6c00
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoAllow anon users to view public forum topics
Darryl Hamilton [Tue, 24 May 2011 03:32:49 +0000 (15:32 +1200)]
Allow anon users to view public forum topics

Cron is effectively an anonymous user which doesn't map
to a proper user. This patch allows anon users to view
forum topics in public groups.

Change-Id: I746908dae8c2252507961a0b09cb132a0f0b379b
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>
11 years agoMerge "blocktype/externalvideo: Adding prezi to list of support sites"
Francois Marier [Tue, 24 May 2011 03:29:47 +0000 (15:29 +1200)]
Merge "blocktype/externalvideo: Adding prezi to list of support sites"

11 years agoMerge "blocktype/externalvideo: Changing supported sites list"
Francois Marier [Tue, 24 May 2011 03:23:14 +0000 (15:23 +1200)]
Merge "blocktype/externalvideo: Changing supported sites list"

11 years agoMerge "Install googleapps on upgrade"
Francois Marier [Tue, 24 May 2011 03:16:26 +0000 (15:16 +1200)]
Merge "Install googleapps on upgrade"

11 years agoblocktype/externalvideo: Adding prezi to list of support sites
Brett Wilkins [Tue, 24 May 2011 03:10:53 +0000 (15:10 +1200)]
blocktype/externalvideo: Adding prezi to list of support sites

Added Prezi image and link to the list of sites supported for embedded media

Change-Id: Ib5fbedc271094747dbe687b54ae4b73e8ea7f00e
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoblocktype/externalvideo: Changing supported sites list
Brett Wilkins [Tue, 24 May 2011 03:05:46 +0000 (15:05 +1200)]
blocktype/externalvideo: Changing supported sites list

The supported sites list is about to get a lot bigger.
To accommodate for this, I've removed the text portion of the link in each list
item, to make more space for more items. I've also made local copies of the
icons as pngs, so that browsers do no warn the users when using https.

Change-Id: Ida52a8f1817e4375a0989f04733287630e4b803c
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoblocktype/externalvideo: Adding support for prezi presentations
Brett Wilkins [Tue, 24 May 2011 01:25:53 +0000 (13:25 +1200)]
blocktype/externalvideo: Adding support for prezi presentations

Prezi is an online flash-based presentation tool, which lets you easily
create a good-looking presentation. More at http://prezi.com/

This change will work for both the embed tags provided by prezi, or the url to
a specific prezi presentation

Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
Change-Id: If036cc91b7980cb59b5252f59133dd32b1817055

11 years agoFix filebrowser changing owner when multiple exist
Hugh Davenport [Thu, 19 May 2011 07:06:59 +0000 (19:06 +1200)]
Fix filebrowser changing owner when multiple exist

Bug #785011

Change-Id: Ia1b03ae04fa5f5049630eda65fcc73ee539dcd77
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
11 years agoblocktype/externalvideo: filtering url for validation
Brett Wilkins [Tue, 24 May 2011 01:14:30 +0000 (13:14 +1200)]
blocktype/externalvideo: filtering url for validation

Filtering url out of any surrounding tags in the validation step
to better handle embedded objects

Change-Id: I861142b3642e8599290b424661899cb47ddcaa94
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
11 years agoMerge "Adding WikiEducator iframe HTML filter"
Francois Marier [Tue, 24 May 2011 00:59:46 +0000 (12:59 +1200)]
Merge "Adding WikiEducator iframe HTML filter"