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

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

for getting collection info from database because
Collection::_construct() will do this

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

because this will be escaped in the template.

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

This patch removes some inapproprate uses of the |= and &= operators
on boolean values.  On view/edit.php, &= was also used on the integer
return value from strlen as if it were a boolean, resulting in the
clean url field being uneditable in some instances where it should
have been editable (see bug #1006634).

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

Also standardised alt text display between inbox and the blocktype
as the block lacked alt text, but leaving it off would have
left the block in state where the icons had no alt text. Unread
icons would not be differentiated from read icons for screenreaders

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

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

Merge changes I5b2cc7e9,Ic9c216d3,I6931a34b,Iafae1c7b,Ibcf3549a,If97f429b,I0ecb734a,I221a5a57,Ie5b88afb,If8695b57,Id6a0d193,I7cf0105e,I9dc34ce9,Ie24a5bfa,I48f0f78c,I80259c76,Ia744e06f,Ic9d1e5d4,If353facd,I643746b1,Ic9b108f4,I71fbf2e5,I3ad549cd,Idd92be96,I8c39548b,I12dad07c,Ic3b9888d,Ia115f605,Ib18ab902,Id4a6b641,I6d0378c6,Ia4653b20,I0f034f04,I878eca87,I227652f1,I3d583b83,I98526af0,I2fb2eaa0,I59b1ab91,I25be1009,I16c826e9,I26528ff5,I8758cf2f,I4a018d8d,I33e12289,I325866c8,Ia43ae086,I0ab970bd

* changes:
  Fix malformed 'display page' urls when cleanurls are enabled
  When changing urlid on the settings page, force a page reload
  Add an option to stop users from editing their profile urls
  Fix malformed block pagination urls when clean urls are enabled
  Delete urlids when deleting users and groups
  Use clean group url for notification after adding a user to a group
  Use clean group urls in redirect after editing group homepage content
  Remove unused ownerlink dwoo variable
  Use clean group urls on view access page
  Use clean group url for redirect after editing group hompepage access
  Use clean group url in 'you have submitted this view...' message
  Use clean group urls on group topics page
  Use clean profile urls on the view access page
  Use clean urls in tagged posts block
  Use clean urls on share page
  Use clean profile and group urls in the artefactchooser
  Use clean profile urls in forums area
  Use get_user_for_display in View::get_owner_object()
  Use clean profile urls on the users tab of the site stats page
  Replace miscellaneous hardcoded view urls
  Use clean urls on notes page
  Use clean urls in watchlist block
  When releasing a view, redirect to the clean group or view url
  Use clean urls on the view submission page
  Use clean urls in admin stats area
  Use clean urls for views listed on my friends page
  Don't fetch views on staff, online users lists unnecessarily
  Collect url information and display clean urls in collections
  Two minor optimisations to get_extra_view_info
  Use clean urls in profile sideblock
  Replace hardcoded urls on choose template page
  Use clean urls on view/artefact.php
  Let can_view_view take a View object
  Use clean urls elsewhere in lib/view.php
  Use clean urls in view access notifications
  Deal with institution views in formatted_owner()
  Use full url in togglewatchlist link
  Use clean urls in watchlist notifications
  Use clean view urls on tags page
  Use View::get_url() to generate view urls in view listings
  Display clean urls on Portfolio->Pages aka My Views
  Generate view urls in get_extra_view_info
  Use clean urls in View::get_url() function
  Use clean urls for view owners after running view_search
  Use profile_url when data is easy or inexpensive to fetch
  Use clean profile urls on sendmessage, denyrequest pages
  Use clean profile urls when data is already available
  Use group_homepage_url when data is easy/inexpensive to fetch

The editviewtabs.tpl template assumed that view urls contained a query
string.  This is no longer true, so the 'new' parameter is now added
in view/(edit|layout|blocks).php rather than inside the template.

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

Bug #1006634, part 1

When a user changes their own url on settings, force a full page
reload so that the profile link in the sideblock works.

Also cleans up existing code to force a reload after a change of theme
or language preference.

Change-Id: Ic9c216d3d295b1cd163fc4bba45a05cc010b7ddb

Bug #1006634, part 1

Some sites may wish to enforce a policy to leave profile urls as close
as possible to usernames.

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

The blog and friends blocks assumed that the view urls contained a
query string.  This is no longer true when clean urls are enabled.

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

Bug #1006634, part 1

Ensures that group and user urlids are freed up when users and groups
are deleted.  Not required for views, because view rows are deleted
completely rather than just marked deleted.

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

Bug #1006634, part 3

When adding a user to a group directly from a user profile.

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

Bug #1006634, part 3

This is the destination for the "Done" button at the bottom of the
block editing page.

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

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

Bug #1006634, part 3

Adds the url id to the information returned by search_group, and
passes this into the javascript in the "Share with other users and
groups" fieldset on the Edit access page.

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

Bug #1006634, part 3

In fact, this url was previously unused, because the $redirecturl
variable was being clobbered immediately after the view type test.

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

Bug #1006634, part 3

For the text under views that have been submitted to groups on
Portfolio -> Pages.

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

Bug #1006634, part 3

For the linked group names listed in Groups -> Topics

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

Bug #1006634, part 3

Adds the profile url to the information returned by search_user, and
passes this into the javascript in the "Share with other users and
groups" fieldset on the Edit access page.

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

Bug #1006634, part 3

Because the urlid field is required here, this patch also modifies the
block to use the display_name function rather than firstname and
lastname.

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

Bug #1006634, part 3

For user and group links under "Access list" on the share tab.

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

Bug #1006634, part 3

This is used when configuring a textbox block, and the user has access
to 'note' artefacts with a different owner.  For example, when adding
a group or institution note into a personal view.

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

Bug #1006634, part 3

These changes will call profile_url on user ids rather than user
records or objects, but this will not result in any additional queries
on these pages: the users are (unfortunately) already being fetched
one by one to run display_name.

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

Bug #1006634, part 3

This is more efficient on many pages, because the user object has
already been fetched, or is about to be fetched, to run display_name
or profile_icon_url.

However, user object returned by get_user_for_display won't allow
can_view_view to tell whether a user is suspended or not, so
suspendedctime is added to this object (it's less identifying than
suspendedcusr).

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

Bug #1006634, part 3

This is for the anecdotal snippets like 'Most is Bob with 55', etc.

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

Bug #1006634, part 3

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

Bug #1006634, part 3

Passes the view records through get_extra_view_info.

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

Bug #1006634, part 3

Passes the view records through get_extra_view_info.

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

Bug #1006634, part 3

Use the global $submittedgroup in releaseview_submit() - it already
contains the group record.

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

Bug #1006634, part 3

Modifies the page to use a View object rather than a db record, so
that get_url can be used.

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

Bug #1006634, part 3

Simplifies the view query and passes the results through
get_extra_view_info to pull out the urls.

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

Bug #1006634, part 3

In order to get the url information for the list of views returned by
get_views(), that function is modified to gather the views in a single
flat list rather than in a structure indexed by user id.  Just before
the view list is returned, the url information is fetched and the user
array is built.

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

On these pages, user views were being fetched along with each user,
but because the view lists are never displayed, they don't need to be
queried.

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

Bug #1006634, part 3

Updates the Collection::views() method to get a url along with each
view, and uses these in the templates related to collections.

Also gets the maximum and minimum displayorder fields by iterating
over returned records instead of performing additional queries.

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