- 02 Jul, 2012 1 commit
-
-
Melissa Draper authored
This adds a new page to the groups subnav menu where participation in the group by members and non-members can be viewed by the people who manage the group. Change-Id: Icd0603b2bb0f448c0523e8ae12c2fb7c8a5e3d4d Signed-off-by:
Melissa Draper <melissa@catalyst.net.nz>
-
- 18 Jun, 2012 4 commits
-
-
Richard Mansfield authored
When cleanurlusersubdomains is on, ajax requests might come from somewhere other than the wwwroot. To avoid cross-domain requests, this patch will set a javascript variable whenever a page is on a subdomain. The ajax wrapper function sendjsonrequest rewrites its url using the variable if necessary. Change-Id: If8a625268895fe1b239f76d515dbd17debe0035e Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When a page at a user subdomain such as http://bob.example.com/my-page is requested by a logged out user, ensure that the user is redirected to a login page that works, rather than to http://example.com/my-page . Because the existing get_full_script_path() function is currently unused, this function is modified to call get_requested_host_name(), and then used in the AccessDeniedException for the login form redirect. Change-Id: I182adeb1a83363512dfde638f2aad23b1d69bcb4 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When a ServerAlias is enabled, it may be useful to get the requested server name rather than the wwwroot. Unlike get_full_script_path(), this function will return the server name from the request in preference to the wwwroot. Change-Id: I9c1817d2722489814301ef805092c1036b920415 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When user subdomain urls are enabled, parts of the site are at subdomains under wwwroot, and we need to ensure that cookies are set with the main site domain to ensure users stay logged in when they go to profile pages. Change-Id: I8c8ac4e01078ff926ade7d28ff8d15566d3391e1
-
- 08 Jun, 2012 1 commit
-
-
Richard Mansfield authored
Bug #1006634, part 3 In many places user urlids are not currently available when the profile url is generated, but it is trivial to get it, and then change the user/view.php url to a profile_url call: - Admin page access report - Profile links in feedback lists - My friends block - Wall posts - Group members block - Group members tab - Recent forum posts block - Group admin lists on forums page - Group admin lists on my groups, find groups - Group admin lists in group info block - Profile sideblock - My friends & find friends pages - Institution landing page - Online users page Change-Id: I33e122896982037a887aad8e3362db450e123e3f Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 07 Jun, 2012 1 commit
-
-
Richard Mansfield authored
See commit b453aa6c - when productionmode is true and local_header_top_content is defined, php complains about $sitetop being undefined. Change-Id: I85d7c549e3dff8a3a4d01037e45e0d49fc0d36ec Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 01 Jun, 2012 2 commits
-
-
Richard Mansfield authored
Bug #1006634, part 1 Clean urls can be enabled at any time. Initialisation for existing users should not be tied to a site upgrade, because it is slow, and most sites won't ever enable it. Instead, add an admin page with a button to regenerate all clean urls based on existing usernames, group names, and page titles. Change-Id: Id8bae56a6500b1b0038fc20aacadf4817e6e922a Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Bug #1006634, part 1 Given a string possibly containing characters that are invalid in a clean url, return a new string, of the allowed length, containing only valid clean url characters. If converting utf8 to ascii, transliterate using the iconv function. Change-Id: I3dfc505e2be327fb103c4ea59d60082fe3358f0c Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 31 May, 2012 1 commit
-
-
Richard Mansfield authored
The Theme constructor expects a triple (basename, logo, stylesheet), which is passed by the User::get_themedata function. But the three properties are stored separately in the User object. If they are grouped together, then it will be easier to switch themes in and out at a later date. The three properties are combined under the 'institutiontheme' name, to make it clear that they are defined by the user's institutions, and to distinguish them from the user's own theme preference. This requires a slight change to code for setting a view theme on view creation, where only the basename property is allowed, because custom themes with logos & stylesheets are not yet available as view themes. Change-Id: Ie400a0f1c4a2172382dfaba14139f1b0b27f2120 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 30 May, 2012 1 commit
-
-
Richard Mansfield authored
Change-Id: I942c1fbeaab3178ea040196ecafafa22bb2c73c2 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 24 May, 2012 1 commit
-
-
Hugh Davenport authored
Change-Id: I8523ec5c780e1e55a4e6cf82904da44036c07ca7 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
- 18 May, 2012 1 commit
-
-
Son Nguyen authored
1. Added a new feature to build_pagination: - setlimit: enable=true/disable=false choosing limit values from the array limitoptions - the array limitoptions (page sizes) has been hardcoded inside build_pagination function. 2. Enable this feature to group member search and porfolio pages search Note: The default number of pages in Porfolio/Pages has been changed to 20 To enable this feature 1. pass 'setlimit' => true to build_pagination function 2. $js = "addLoadEvent(function() {p = {$pagination['javascript']}});"; 3. $smarty->assign('INLINEJAVASCRIPT', $js); Change-Id: Ib44b28d50895c6ea604bb1aedaebae3a3f1bfc1a Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 14 May, 2012 2 commits
-
-
Richard Mansfield authored
Including the file https://browserid.org/include.js with an inline script tag sometimes causes an annoying flash. This goes away when the javascript is added into the <head> element instead. Change-Id: I5840e84e27d56bc9e8cf1a321e71ef3072704113 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Kristina Hoeppner authored
to delete superfluous words in the menu where they aren't necessary. Change-Id: Iaac0adc12aa14a5b86c8b6541173a3d06bd3eb90 Signed-off-by:
Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
-
- 09 May, 2012 1 commit
-
-
Richard Mansfield authored
The pluralrule string is used to generate plural forms in javascript, so % signs should not be replaced. Using get_raw_string rather than get_string reads the string as-is, without running it through sprintf. Change-Id: I709b8ef623cdc4df24828866dc62dd229107ef60 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 12 Apr, 2012 2 commits
-
-
Richard Mansfield authored
Adds a new page for Site admins to manage the list of sites for which iframes are allowed by htmlpurifier. Whenever an item is added, edited, or deleted, the regex used by HTMLPurifier is updated. Sites are identified by favicon, and by a string entered by the Admin to be used as the alt/title text for the favicon image. The source of the favicon image can be modified in config.php, but the google service is used by default. Change-Id: I4117de82691a002bf250ea71622eccfad4d5f8df Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Builds the htmlpurifier safe iframe regexp from a list of sites stored in the database, instead of a hardcoded array. Each site in the safe iframe list is associated with a name. This will allow several regexp items to be grouped together under the same name when they're matching urls from the same site. Additionally, the domain part of each site is stored in a second list along with the names, so that it will be easy to fetch the favicon for display in places such as the external media block configuration form. Change-Id: I7fd2bfefbff0881e70b94beb9e8d3efb43f0f9e7 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 28 Mar, 2012 1 commit
-
-
Richard Mansfield authored
Dots in the list of safe iframe sources are not escaped before use in the regular expression passed to htmlpurifier, but they should be because of their special meaning inside patterns. This will prevent people from registering domains like 'www-youtube.com' and 'playerxvimeo.com' and embedding iframes from those sites in their pages. Change-Id: I94ceedd77172cbb6650efad0ab7edfae92f5f7e8 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 21 Feb, 2012 2 commits
-
-
Francois Marier authored
The new HTML.SafeIframe setting in HTML Purifier 4.4.0 allows us to remove our fragile custom filters. The regular expressions are not quite as tight, but they are restricted to the src attribute and HTML Purifier will hopefully apply the right filters. Bug #922360 (also fixes bug #885066) Change-Id: Ifaa9f13ae77b28e18df640103e205a94bc3af2d7 Signed-off-by:
Francois Marier <francois@catalyst.net.nz>
-
Richard Mansfield authored
When an html filter is removed from disk for some reason, but is still listed in the config table, you get a fatal error. If an upgrade removes a filter, this will result in a broken-looking page before the upgrade is run. We don't need to throw a fatal error when a filter is missing, the site will run just fine with more html stripped out. Change-Id: Ic6498f368561c2e005d44562d518bde94bd3457c Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 13 Feb, 2012 1 commit
-
-
Richard Mansfield authored
Also keeps the count in the $USER object up to date whenever the user deletes or reads a notification. When new notifications are generated for a live user by another user, or on cron, the logged-in user's unread count is reloaded from the database into the session either on hitting the inbox, or whenever $USER is committed for some other reason. The code to reload the background fields on commit of the LiveUser object has been changed to ensure that it still works at upgrade time, where the 'reload' column doesn't exist in the user table yet, but *does* exist in the User object. Change-Id: I9c9a81bf77d0927352902dee0d989d6122757b47 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 10 Feb, 2012 1 commit
-
-
Christopher Tombleson authored
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>
-
- 07 Feb, 2012 1 commit
-
-
Richard Mansfield authored
Although this is currently just for user searches, using the terms "Site Information" for site staff, and "Institution Information" for institution staff will allow us to add site/institution statistics under the same menu. Change-Id: I40bae94406a1a6f16b428e3821f3be1ec41ae52d Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 01 Feb, 2012 1 commit
-
-
Richard Mansfield authored
Submission of the create group form with the 'publicly viewable group' checkbox ticked produces the error "The 'public' parameter is not an integer". This is caused by an error in the check for form submission due to a change in the form names in commit 5436cc00 . Change-Id: Idfb4b2ec10e646aa4b6ee3b517fbb13210a1ed01 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 30 Jan, 2012 2 commits
-
-
Francois Marier authored
This makes upgrading the jQuery version more tedious than it really has to be. Change-Id: I6dec636cffabdba9755dd418b3fb2ad5449e5011 Signed-off-by:
Francois Marier <francois@catalyst.net.nz>
-
Francois Marier authored
We should try not to bundle "compiled" and source versions of third-party code. In this case, minification should be done on all Javascript in Mahara and then cached. jQuery is far from being the only JS file that would benefit from being compressed. Change-Id: I65d5b63fc80258bfa4e80ca6fb0578870e61664a Signed-off-by:
Francois Marier <francois@catalyst.net.nz>
-
- 16 Jan, 2012 1 commit
-
-
Richard Mansfield authored
To allow for pages that are accessible by both admins and staff, two new constants are added, STAFF and INSTITUTIONALSTAFF. The existing checks for admin and institutional admin permissions are moved into a new function which also takes account of the new staff permissions. Change-Id: I60de6f74bd5f2a208be8e15e8a71f16b689c80d6 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 05 Jan, 2012 1 commit
-
-
Richard Mansfield authored
Trying to set this option fails when an open_basedir restriction is in effect. This patch also checks open_basedir and adds a warning to the admin area, and in the sanity check for an unwritable dataroot, the open_basedir directories are listed on the screen as a hint for installation. Change-Id: Ic394517f436955b038f321b06011b818d4967026 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 20 Dec, 2011 1 commit
-
-
Melissa Draper authored
PIEFORM_GOT_HEADDATA gets (re-)defined in web.php. This commit adds a check to make sure it isn't already defined. Change-Id: Ia6ab49f791e7efcbbbba8b3ad3cc4f5a36fadfb7 Signed-off-by:
Melissa Draper <melissa@catalyst.net.nz>
-
- 14 Dec, 2011 1 commit
-
-
Richard Mansfield authored
If a pieform is built after a call to the smarty function, elements that a pieform element wants to put into <head> (usually js files) may be omitted and it can be hard to track down the cause of these errors. This patch will produce a warning (intended for the programmer) if a pieform element that defines the _get_headdata() function is built after the smarty function has already been called. Change-Id: Icf120242f521d4324548ac84228fea54d75eab8c Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 12 Dec, 2011 1 commit
-
-
Richard Mansfield authored
Allows language packs to specify an array of strings (one for each plural form in the language) instead of a single string. The first of the variable (sprintf) arguments is assumed to be the number we need to check to choose a plural form. This argument is passed into a language-specific function defined in langconfig.php, which returns the appropriate plural form based on a formula. A similar scheme is used for strings formatted by the javascript get_string function in mahara.js. See http://www.gnu.org/s/hello/manual/gettext/Plural-forms.html Change-Id: Ifb58ac4f1e13a54edbc57e5c0a9faaf8454e53a4 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 01 Dec, 2011 1 commit
-
-
Richard Mansfield authored
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>
-
- 21 Nov, 2011 1 commit
-
-
Richard Mansfield authored
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>
-
- 17 Nov, 2011 2 commits
-
-
Melissa Draper authored
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>
-
Richard Mansfield authored
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>
-
- 07 Nov, 2011 1 commit
-
-
Richard Mansfield authored
The $dying variable mentioned in the comment being deleted in this patch is not necessary because checking the value of $group stops a 2nd exception being thrown. The return value of group_current_group is only checked in the smarty function to stop a "Trying to get property of non-object" warning from being logged. Change-Id: Ic78458bbe6ebe52fc4cb82cc661949d97ed450b4 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 01 Nov, 2011 1 commit
-
-
Melissa Draper authored
URLs should be checked before use to prevent misbehaviour. This patch adds a function for that purpose. None of these fixes are believed to be exploitable. Change-Id: Idaf8da739c344b925c7ea3644591a230589eb6e3 Signed-off-by:
Melissa Draper <melissa@catalyst.net.nz>
-
- 12 Oct, 2011 1 commit
-
-
Hugh Davenport authored
Bug #872619 Regression from 79810c3d Basically, a default parameter of null was given, then trim was called, which made it into the string '' which then failed the test is_null in the files it was used. This reorders the functions so that the trim is called after the test to see whether the default should be used. This means that the default value is never trimmed, and can be null. One exception to this, is the param_boolean which doesn't test to see whether it is the default that is returned, so a check is made first to see whether it is null. Change-Id: I66d7253a8414dec7eb3ea67ebd363ea068a32012 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
- 07 Oct, 2011 1 commit
-
-
Francois Marier authored
Thanks to Melissa Newman for the fix. Change-Id: Ied9197dd0e95df388e741af807ef498aeb85a102 Signed-off-by:
Francois Marier <francois@catalyst.net.nz>
-