If aspell is found on the system use it for spellchecking.
Otherwise use GoogleSpell.

Bug#812030

Also renamed the error() function in htdocs/js/tinymce/plugins/spellchecker/includes/general.php
to mceError() because it conflicts with the mahara defined error() function.

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

Now that the unread message count has been removed from the profile
sideblock (see commit 8b4933e1

), the
javascript updateUnreadCount function needs to be modified to read the
existing count from the top-right header rather than the profile
sideblock.

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

When copying a collection, navigation blocks in the copied pages
should be updated to point at the new copy of the collection.

After all the pages are copied, all the newly copied navigation blocks
are examined to see if they navigate the collection being copied.  If
so, they are updated to navigate the new copy of the collection.  When
a navigation block points at some collection other than the one being
copied, it is left alone.

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

When displaying a pieforms fieldset, check the value of the 'fs'
parameter before deciding whether to 'collapse' the fieldset.  This
allows links to be created to (for example) the 'Group settings'
section of site options.

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

Sometimes it is useful for a site which has multiple themes in use to
be able to add a custom template (for example, a custom sideblock)
that appears in all themes, including the core themes and the raw
theme.

This patch adds local/theme/templates/ to the template search path, as
a fallback for when a template is not found in any of the theme
directories.

It is usually possible to achieve the same thing by putting the custom
template in the raw theme, but it is cleaner to keep them outside the
raw theme, and custom themes should not be required to inherit from
raw anyway.

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

When an exception occurs in a command line upgrade, the message should
be output as text rather than an html page, to make it easier to read.

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

The values of artefact,usr columns of the table are not necessarily
unique.  Perhaps a better option would be to create an id column.
This primary key was added in a3f6fbfe

.

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

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

This reverts commit 8e8132fb.

That commit was not ready to be merged.  As it says in the commit
message, "if the session directory goes away somehow between updates,
there is currently _no_ way to restore it without one of these two
options. This may need to be considered before merging in this
change."

We can revert this revert when we have a good alternative for creating
the session directories.

Change-Id: I5141832da3225e202feef19dccabfea9ff35beeb

http://www.sophos.com/en-us/rss/sophos-security-news.xml

 for example
is rather poorly constructed and just has closing title tags rather
than an actual title. This patch adds some fallback so that links
are actually clickable and not lost to the UI.

Change-Id: Ida3b61f3cf60ddaa5f4b96795cd43ee443c111e4
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Sometimes a custom theme wants to override homeinfo.tpl with some
different content for the homepage.  There's some javascript on the
homepage (to hide the homeinfo boxes) that assumes an element with the
id 'hideinfo', but custom themes should not have to define this.

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

Change-Id: I87560e7a6b37de99edcdf2a9b5371d766eb95b60
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

When the site or institution has disabled public views, there's a
notice on the view access page to that effect, but the user can
happily create new secret urls with no indication that they won't
work.  This patch removes the generate new secret url button, and adds
a notice to the secret url page to inform the user when they're not
allowed to create public pages.  Also adds a sentence to the site
setting to make it clearer that disabling public pages also disables
secret urls.

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

When cron finds a function with a stale (day-old) lock, just remove
the lock and give up rather than trying to execute the function again.
It's already pretty late, and waiting another minute for the next cron
to start won't make a difference.

This should avoid the case where two copies of cron both find the stale
lock at the same time, and restart simultaneously.  It won't matter if
cron_lock fails to get a $started value because the row has been
deleted: the next instance of cron to run will be able to insert the
row.

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

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

Sometimes when creating a thumbnail image, getimagesize doesn't return
a value for bits per pixel on certain gifs.  This creates warnings in
the logs when approximating the required memory consumption, and also
refuses to create the thumbnail.  We can check the mimetype of the
image when 'bits' is not set, and when it's a gif, just assume the
maximum value (8 bpp).

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

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

These were using undefined strings and gave messages like "The end
date for '[[group/view]]' access cannot be in the past".

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

When the view access page is submitted with an error, php warnings
are emitted when the rendering the access rows.

First because the pieform element assumes that an 'accesstype' index
exists in the accesslist value, but this is only true when the
accesslist still contains database records rather than the list
submitted by the form.

Second,  disabled public access record causes a warning because
'public' isn't in the list of 'presets' allowed to be added to the
view, so we need to keep track of the allowed presets and the full
list of presets that may have been allowed in the past.

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

When you get an 'end date in the past' error from the view access page,
the offending record is not displayed because the form removes stale
records as it pulls them out of the database.  However, when we're just
validating a bad stop date entered by the user, we need to make sure
it's still displayed to avoid confusion over the error.

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

When you submit the view access page and there's an error in the form
submission (due to bad start/stopdates, etc.), sometimes an item is
removed from the array of access records by unsetting the array key.
Messing with the ordering of the array keys causes a javascript error
which stops the access list from being displayed.

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

We removed info from the email subject and added it to headers. However
people generally don't see the headers, so this patch adds the info back
as pseudoheaders, while removing duplicate info such as poster name,
topic and time.

Change-Id: I1063c70693e3b6345d41225b8fed53e0c20e7d95
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Urls stored in the url field of notification_internal_activity contain
the site's wwwroot.  This leads to broken links when the wwwroot is
changed.  It also dangerously turns what should be local links into
remote ones when for example a production database is copied into a
test Mahara instance.

This patch does three things:
- Removes the wwwroot from urls passed to ActivityType constructors
- Adds the wwwroot back on the url when sending email and emaildigest
  notifications, and when displaying them on the site.
- Removes the wwwroot from the url in all existing rows of
  notification_internal_activity.

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

These are mostly just missing semicolons. No code changes.

If you use emacs already: apt-get install js2-mode
If you don't use emacs: apt-get install emacs js2-mode ;-)

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

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

When a user has many views shared with them, the view_search query
may exceed mysql's max_join_size and cause an unrecoverable error on
a user's dashboard, among other places.  Replacing a bunch of these
outer joins with subselects fixes the issue, and in a few tests on a
large postgres db, also improved performance.

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

Change-Id: I9ab910ebad9449ae2125e100d653e1c0cd460495
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

The submenu under settings in not usable with drop-down navigation,
because there's no top-level item for it to hang from.  This patch
changes it to group-style tabs within the page when drop-down
navigation is configured.  Just creating a link from the inbox to
the notification prefs is not sufficient because plugins can now
hook into the right menu (see bug #834171).

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

In IE, when dragging a blocktype image into the content area of the
view editor, the image appears to slip underneath the white box saying
"This area shows a preview of what your page will look like..." and
then out the other side again.  Setting the z-index property on the
element containing blocktype list fixes the issue.

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

When dragging a blocktype in the view editor in IE, dragging it very
slowly usually causes the block to suddenly disappear, and the cursor
to turn into a crossed circle.  If you let go of the mouse, the
blocktype image appears at the cursor, and clicking the mouse again
will drop the blocktype.  This can be fixed by disabling IE's default
startdrag function.

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

There are several places in the code where we make directories
for stuff, both in the filesystem and in the artefacts table.
If they have trailing spaces, then this can mess up users html
exports etc. This patch should make exports safe for existing
folders with whitespace at the end, and prevent new folders from
from being made with the problem.

Change-Id: Ia593f7f773e5ffe91ce74e8a736074b1fe1026b2
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Bug #890530

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

Forum email subjects are unwieldy so move forum name and group name to
custom headers so users can filter as well as have a more concise
subject line. Values in headers trimmed to 100 char based on information
at http://stackoverflow.com/questions/2721605/maximum-size-of-email-x-headers



Change-Id: Iad9c7c3101ff81f19f3beafbe1811f28f3d3faa5
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Bug #568140

This problem only occurs when Javascript is disabled.
This is one possible fix, which doesn't require changes to
the database schema.

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

This will delete the current mnet key and regenerate a new one

Bug #890583

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

This has already been done for the main menu

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

This has been already been done for the main and admin menus.

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

This has been unnecessary for some time now, because the same count
appears next to the envelope in the top right of the header.

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

The html filter will now parse links with underscores in them.

Bug #884438

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

Updating a site menu item and swapping it from an external url to
a site file or vice versa was failing to create the correct type of
link on account of incorrect parameters. Unfortunately this can't
fix existing muddled links, as it has no way of knowing whether the
url value or the file value in the database is the one to use.

Change-Id: Ib8ac2da42125b020a1214b268c079f93166d2da8
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>