Commit cae3d7a6 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Updating outdated links in the Mahara source code" into 1.10_STABLE

parents 829261ab dbc2403e
......@@ -11,7 +11,7 @@
/*
* For more information about blog LEAP export, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Export/Blog_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Export/Blog_Artefact_Plugin
*/
defined('INTERNAL') || die();
......
......@@ -15,7 +15,7 @@ defined('INTERNAL') || die();
* Implements Leap2A import of blog related entries into Mahara
*
* For more information about Leap blog importing, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/Blog_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Import/Blog_Artefact_Plugin
*
* TODO:
* - Get entries that feel they're part of the blog, not just entries the blog feels are part of it
......
......@@ -11,7 +11,7 @@
/*
* For more information about file LEAP export, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Export/File_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Export/File_Artefact_Plugin
*/
defined('INTERNAL') || die();
......
......@@ -15,7 +15,7 @@ defined('INTERNAL') || die();
* Implements Leap2A import of file/folder related entries into Mahara
*
* For more information about Leap file importing, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/File_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Import/File_Artefact_Plugin
*
* TODO:
* - Protect get_children_of_folder against circular references
......
......@@ -11,7 +11,7 @@
/*
* For more information about internal LEAP export, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Export/Internal_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Export/Internal_Artefact_Plugin
*/
class LeapExportInternal extends LeapExportArtefactPlugin {
......
......@@ -15,7 +15,7 @@ defined('INTERNAL') || die();
* Implements Leap2A import of profile related entries into Mahara
*
* For more information about Leap profile importing, see:
* http://wiki.mahara.org/Developer_Area/Import%2f%2fExport/LEAP_Import/Internal_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Import/Internal_Artefact_Plugin
*
* TODO:
* - how do we want to handle potentially overwriting data?
......
......@@ -11,7 +11,7 @@
/*
* For more information about resume LEAP export, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Export/Resume_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Export/Resume_Artefact_Plugin
*/
/**
......
......@@ -15,7 +15,7 @@ defined('INTERNAL') || die();
* Implements Leap2A import of resume related entries into Mahara
*
* For more information about Leap resume importing, see:
* http://wiki.mahara.org/Developer_Area/Import//Export/LEAP_Import/Resume_Artefact_Plugin
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Import/Resume_Artefact_Plugin
*/
class LeapImportResume extends LeapImportArtefactPlugin {
......
......@@ -10,5 +10,5 @@ user attributes" settings in order for groups to be synced.</p>
<p>Group members can be removed as well as added by this setting. If a group is no longer found in the LDAP
records, all of its members will be removed from the group.</p>
<p>This setting will have no effect if the cron is not running. See the
<a href="http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
<a href="https://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
instructions on how to set it up.</p>
\ No newline at end of file
......@@ -5,6 +5,6 @@
user accounts based on records in the LDAP server. By default, this cron task will execute once
daily at midnight (server time). Edit the record in the "auth_cron" table or use the optional command-line script
supplied at htdocs/auth/ldap/cli/sync_users.php if you wish to schedule it to run at other times or with other settings.</p>
<p>This setting will have no effect if the cron is not running. See the
<a href="http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
<p>This setting will have no effect if the cron is not running. See the
<a href="https://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara">installation guide</a> for
instructions on how to set it up.</p>
\ No newline at end of file
......@@ -17,7 +17,7 @@
* 2. Change the values in it to suit your environment.
*
* Information about this file is available on the Mahara wiki:
* http://wiki.mahara.org/System_Administrator's_Guide/Installing_Mahara#Create_Mahara's_config.php
* https://wiki.mahara.org/wiki/System_Administrator's_Guide/Installing_Mahara#Create_Mahara's_config.php
*
* This file includes only the most commonly used Mahara configuration directives. For more options
* that can be placed in this file, see the Mahara lib file
......
......@@ -10,7 +10,7 @@
</head>
<body>
<div id="mahara-logo">
<a href="http://mahara.org/"><img src="{$maharalogo}" alt="Mahara export"></a>
<a href="https://mahara.org/"><img src="{$maharalogo}" alt="Mahara export"></a>
</div>
<h1><a href="{$rootpath}index.html">{$page_heading}</a></h1>
<div id="content">
......
......@@ -13,4 +13,4 @@ defined('INTERNAL') || die();
$string['title'] = 'Leap2A';
// TODO: link Leap2A standard format to a primer document on our wiki about Leap2A
$string['description'] = 'This gives you an export in the <a href="http://wiki.leapspecs.org/2A/specification">Leap2A standard format</a>. You can later use this to import your data into <a href="https://wiki.mahara.org/index.php/Developer_Area/Import//Export/Interoperability">other Leap2A-compliant systems</a>, although the export is hard for humans to read.';
$string['description'] = 'This gives you an export in the <a href="http://wiki.leapspecs.org/2A/specification">Leap2A standard format</a>. You can later use this to import your data into <a href="https://wiki.mahara.org/wiki/Developer_Area/Import//Export/Interoperability">other Leap2A-compliant systems</a>, although the export is hard for humans to read.';
......@@ -13,7 +13,7 @@ defined('INTERNAL') || die();
/**
* LEAP export plugin. See http://wiki.cetis.ac.uk/2009-03/Leap2A_specification and
* http://wiki.mahara.org/Developer_Area/Import%2f%2fExport/LEAP_Export
* https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Export
*/
class PluginExportLeap extends PluginExport {
......
......@@ -10,5 +10,5 @@
<id>{$WWWROOT}export/{$userid}/{$export_time}</id>
<title>Mahara Leap2A Export for {$name}, {$export_time|format_date:"strftimedatetimeshort"}</title>
<updated>{$export_time_rfc3339}</updated>
<generator uri="http://mahara.org/" version="{$leap_export_version}">Mahara</generator>
<generator uri="https://mahara.org/" version="{$leap_export_version}">Mahara</generator>
{include file="export:leap:author.tpl"}
......@@ -2,7 +2,7 @@
/**
* Mahara: Electronic portfolio, weblog, resume builder and social networking
* Copyright (C) 2006-2013 Catalyst IT Ltd and others; see:
* http://wiki.mahara.org/Contributors
* https://wiki.mahara.org/wiki/Contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......
......@@ -55,6 +55,9 @@ class PluginImportLeap extends PluginImport {
const NS_CATEGORIES_200903 = 'http://wiki.cetis.ac.uk/2009-03/LEAP2A_categories/';
const NS_LEAP = 'http://terms.leapspecs.org/';
const NS_CATEGORIES = 'http://wiki.leapspecs.org/2A/categories/';
// NOTE: Even though this URL is no longer valid, it must not change because it is used as an identifier
// in existing XML files.
// (Correct current URL is https://wiki.mahara.org/wiki/Developer_Area/Import//Export/LEAP_Extensions# )
const NS_MAHARA = 'http://wiki.mahara.org/Developer_Area/Import%2F%2FExport/LEAP_Extensions#';
const XHTML_DIV = '<div xmlns="http://www.w3.org/1999/xhtml">';
......
......@@ -16,7 +16,7 @@ $string['administration'] = 'Administration';
// Installer
$string['installation'] = 'Installation';
$string['release'] = 'version %s (%s)';
$string['copyright'] = 'Copyright &copy; 2006 onwards, <a href="http://wiki.mahara.org/Contributors">Catalyst IT and others</a>';
$string['copyright'] = 'Copyright &copy; 2006 onwards, <a href="https://wiki.mahara.org/wiki/Contributors">Catalyst IT and others</a>';
$string['installmahara'] = 'Install Mahara';
$string['component'] = 'Component or plugin';
$string['continue'] = 'Continue';
......@@ -169,7 +169,7 @@ $string['cleanurlsdescription'] = "
<li>http://mahara.example.com/user/bob/bobs-portfolio-page</li>
</ul>
Before enabling this option, your server administrator must configure your web server so that incoming requests have their URLs rewritten.</p>
<p>See <a href=\"https://wiki.mahara.org/index.php/System_Administrator's_Guide/Clean_URL_Configuration\">Clean URL Configuration</a> on the Mahara wiki for instructions on how to do this.</p>
<p>See <a href=\"https://wiki.mahara.org/wiki/System_Administrator's_Guide/Clean_URL_Configuration\">Clean URL Configuration</a> on the Mahara wiki for instructions on how to do this.</p>
";
$string['cleanurlsdisabled'] = 'Clean URLs are disabled.';
$string['cleanurlsettings'] = 'Clean URL settings';
......@@ -232,10 +232,10 @@ $string['registrationfailedtrylater'] = 'Registration failed with error code %s.
$string['registrationsuccessfulthanksforregistering'] = 'Registration successful - thanks for registering.';
$string['registeryourmaharasite'] = 'Register your Mahara site';
$string['registeryourmaharasitesummary'] = '
<p>You can choose to register your Mahara site with <a href="http://mahara.org/">mahara.org</a> and help us to build up a picture of the Mahara installations around the world. Registering will remove this notice.</p>
<p>You can choose to register your Mahara site with <a href="https://mahara.org/">mahara.org</a> and help us to build up a picture of the Mahara installations around the world. Registering will remove this notice.</p>
<p>You can register your site and preview the information that will be sent on the <strong><a href="%sadmin/registersite.php">site registration page.</a></strong></p>';
$string['registeryourmaharasitedetail'] = '
<p>You can choose to register your Mahara site with <a href="http://mahara.org/">mahara.org</a>. Registration is free and helps us build up a picture of the Mahara installations around the world.</p>
<p>You can choose to register your Mahara site with <a href="https://mahara.org/">mahara.org</a>. Registration is free and helps us build up a picture of the Mahara installations around the world.</p>
<p>You can see the information that will be sent to mahara.org - nothing that can personally identify any of your users will be sent.</p>
<p>If you tick &quot;send weekly updates&quot;, Mahara will automatically send an update to mahara.org once a week with your updated information.</p>
<p>Registering will remove this notice. You will be able to change whether you send weekly updates on the <a href="%sadmin/site/options.php">site options</a> page.</p>';
......@@ -264,7 +264,7 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups';
$string['viewsperuser'] = 'Users who make pages have about %s pages each';
$string['Cron'] = 'Cron';
$string['runningnormally'] = 'Running normally';
$string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br>See the <a href="https://wiki.mahara.org/wiki/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['cronnotrunningsiteclosed'] = '<span class="error">Cron is not running.</span><br>The site is currently closed. Please re-open the site for the cron to run.';
$string['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...';
......@@ -814,7 +814,7 @@ $string['failedtoobtainuploadedleapfile'] = 'Failed to obtain the uploaded Leap2
$string['failedtounzipleap2afile'] = 'Failed to unzip the Leap2A file. Check the error log for more information.';
$string['fileisnotaziporxmlfile'] = 'This file has not been detected to be a ZIP file or XML file.';
$string['howdoyouwanttocreatethisuser'] = 'How do you want to create this user?';
$string['leap2aimportfailed'] = '<p><strong>Sorry - Importing the Leap2A file failed.</strong></p><p>This could be because you did not select a valid Leap2A file to upload or because the version of your Leap2A file is not supported by this Mahara version. Alternatively, there may be a bug in Mahara causing your file to fail, even though it is valid.</p><p>Please <a href="add.php">go back and try again</a>, and if the problem persists, you may want to post to the <a href="http://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file.</p>';
$string['leap2aimportfailed'] = '<p><strong>Sorry - Importing the Leap2A file failed.</strong></p><p>This could be because you did not select a valid Leap2A file to upload or because the version of your Leap2A file is not supported by this Mahara version. Alternatively, there may be a bug in Mahara causing your file to fail, even though it is valid.</p><p>Please <a href="add.php">go back and try again</a>, and if the problem persists, you may want to post to the <a href="https://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file.</p>';
$string['newuseremailnotsent'] = 'Failed to send welcome email to new user.';
$string['newusercreated'] = 'New user account created successfully';
$string['noleap2axmlfiledetected'] = 'No leap2a.xml file detected - please check your export file again.';
......
......@@ -55,8 +55,8 @@ The error received was:
';
$string['dbnotutf8'] = 'You are not using a UTF-8 database. Mahara stores all data as UTF-8 internally. Please drop and re-create your database using UTF-8 encoding.';
$string['dbversioncheckfailed'] = 'Your database server version is not new enough to successfully run Mahara. Your server is %s %s, but Mahara requires at least version %s.';
$string['plpgsqlnotavailable'] = 'The PL/pgSQL language is not enabled in your Postgres installation, and Mahara cannot enable it. Please install PL/pgSQL in your database manually. For instructions on how to do this, see https://wiki.mahara.org/index.php/System_Administrator\'s_Guide/Enabling_Plpgsql';
$string['mysqlnotriggerprivilege'] = 'Mahara requires permission to create database triggers, but is unable to do so. Please ensure that the trigger privilege has been granted to the appropriate user in your MySQL installation. For instructions on how to do this, see https://wiki.mahara.org/index.php/System_Administrator\'s_Guide/Granting_Trigger_Privilege';
$string['plpgsqlnotavailable'] = 'The PL/pgSQL language is not enabled in your Postgres installation, and Mahara cannot enable it. Please install PL/pgSQL in your database manually. For instructions on how to do this, see https://wiki.mahara.org/wiki/System_Administrator\'s_Guide/Enabling_Plpgsql';
$string['mysqlnotriggerprivilege'] = 'Mahara requires permission to create database triggers, but is unable to do so. Please ensure that the trigger privilege has been granted to the appropriate user in your MySQL installation. For instructions on how to do this, see https://wiki.mahara.org/wiki/System_Administrator\'s_Guide/Granting_Trigger_Privilege';
$string['mbstringneeded'] = 'Please install the mbstring extension for php. This is needed if you have UTF-8 characters in usernames. Otherwise, users might not be able to login.';
// general exception error messages
......
......@@ -2,4 +2,4 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Leap2A files</h3>
<p>This option gives you the ability to import a <a href="http://wiki.cetis.ac.uk/2009-03/Leap2A_specification#About_this_specification" target="_blank">Leap2A export file</a>, which contains data about a person's portfolio.</p>
<p>You can read more on the Mahara wiki about <a href="http://wiki.mahara.org/Developer_Area/Import//Export" target="_blank">Mahara's support for Leap2A</a>.</p>
<p>You can read more on the Mahara wiki about <a href="https://wiki.mahara.org/wiki/Developer_Area/Import//Export" target="_blank">Mahara's support for Leap2A</a>.</p>
......@@ -14,7 +14,7 @@ defined('INTERNAL') || die();
$string['Import'] = 'Import';
$string['importexceedquota'] = 'The total size of the new files in your uploaded Leap2A file would exceed your quota. You need to remove some of the files and try again.';
$string['importsuccessfully'] = 'Your portfolio was imported successfully';
$string['importfailed'] = '<p><strong>Sorry - the import of your Leap2A file failed.</strong></p><p>This could be because you did not select a valid Leap2A file to upload or because the version of your Leap2A file is not supported by this Mahara version. Alternatively, there may be a bug in Mahara causing the import to fail, even though the Leap2A file is valid.</p><p>Please go back and try again, and if the problem persists, you may want to post to the <a href="http://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file.</p>';
$string['importfailed'] = '<p><strong>Sorry - the import of your Leap2A file failed.</strong></p><p>This could be because you did not select a valid Leap2A file to upload or because the version of your Leap2A file is not supported by this Mahara version. Alternatively, there may be a bug in Mahara causing the import to fail, even though the Leap2A file is valid.</p><p>Please go back and try again, and if the problem persists, you may want to post to the <a href="https://mahara.org/forums/">Mahara Forums</a> to ask for help. Be prepared to be asked for a copy of your file.</p>';
$string['importwitherrors'] = 'Your portfolio was imported with some errors.';
$string['importartefactplugindata'] = 'Importing artefact plugin data';
$string['importartefacts'] = 'Importing artefacts';
......
......@@ -14,7 +14,7 @@ defined('INTERNAL') || die();
$string['aboutdefaultcontent'] = '<h1>About</h1>
<p><i>Add text about your organisation or the installation here</i></p>
<p><strong>[<i>Name of your installation here</i>]</strong> is powered by <a href="http://mahara.org">Mahara</a>. Mahara is provided freely as open source software (under the GNU General Public License). In brief, this means that you are allowed to copy, use and modify Mahara provided you agree to:</p>
<p><strong>[<i>Name of your installation here</i>]</strong> is powered by <a href="https://mahara.org">Mahara</a>. Mahara is provided freely as open source software (under the GNU General Public License). In brief, this means that you are allowed to copy, use and modify Mahara provided you agree to:</p>
<ul>
<li>provide the source code to others, </li>
......
......@@ -235,7 +235,7 @@ class Pieform {/*{{{*/
if (isset($this->data['spam'])) {
// Enable form tricks to make it harder for bots to fill in the form.
// This was moved from lib/antispam.php, see:
// http://wiki.mahara.org/Developer_Area/Specifications_in_Development/Anti-spam#section_7
// https://wiki.mahara.org/wiki/Developer_Area/Specifications_in_Development/Anti-spam#section_7
//
// Use the spam_error() method in your _validate function to check whether a submitted form
// has failed any of these checks.
......
......@@ -13,7 +13,7 @@ defined('INTERNAL') || die();
$config = new stdClass();
// See https://wiki.mahara.org/index.php/Developer_Area/Version_Numbering_Policy
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2014092331;
......
......@@ -5,7 +5,7 @@ It can be used for customizations to your site that don't fit into any Mahara's
other plugin types, as well as for accessing various "Hooks" to override the
default behavior.
See also https://wiki.mahara.org/index.php/Developer_Area/Local_customizations
See also https://wiki.mahara.org/wiki/Developer_Area/Local_customizations
Function hooks
......
......@@ -46,7 +46,7 @@ else {
// ===============================
$xmldoc = new DOMDocument('1.0', 'UTF-8');
$comment = $xmldoc->appendChild(new DOMComment('Skin definitions to be used with Mahara pages. More info about Mahara at http://mahara.org'));
$comment = $xmldoc->appendChild(new DOMComment('Skin definitions to be used with Mahara pages. More info about Mahara at https://mahara.org'));
$topelement = $xmldoc->createElement('skins');
$topnode = $xmldoc->appendChild($topelement);
......
{include file='header.tpl' nosearch=true}
<h3 class="center"><a href="http://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs}</h3>
<h3 class="center"><a href="https://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs}</h3>
<div id="gpl-terms">
{str tag='copyright' section='admin'}
......@@ -17,7 +17,7 @@ GNU General Public License for more details.</p>
along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/</a>.
</div>
<div class="message">Before you install Mahara, you may want to check out the <a href="http://wiki.mahara.org/Release_Notes{if substr($releaseargs[0], -3) != 'dev'}/{$releaseargs[0]}{/if}" target="_blank">release notes</a> for this release.</div>
<div class="message">Before you install Mahara, you may want to check out the <a href="https://wiki.mahara.org/wiki/Release_Notes" target="_blank">release notes</a> for this release.</div>
<form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" class="submit" value="{str tag=installmahara section=admin}"></form>
......
......@@ -4,8 +4,8 @@
</div>
<div id="footer-wrap">
<div class="cb"></div>
<div id="powered-by"><a href="http://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt=""></a></div>
<div id="release"><a href="http://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, {str tag='copyright' section='admin'}</div>
<div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt=""></a></div>
<div id="release"><a href="https://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, {str tag='copyright' section='admin'}</div>
<div class="cb"></div>
</div>
</div>
......
......@@ -20,9 +20,9 @@
</div><!-- mainmiddlewrap -->
<div id="footer-wrap" {if $editing == true}class="editcontent"{/if}>
<div id="footer">
<div id="powered-by"><a href="http://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt="Powered by Mahara"></a></div>
<div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt="Powered by Mahara"></a></div>
<!-- This site is powered by Mahara, an Open Source
ePortfolio system. See http://mahara.org/ for more
ePortfolio system. See https://mahara.org/ for more
details.
NOTE: this image and link are a way that you can
support the Mahara project. Please consider
......
......@@ -40,7 +40,7 @@
<tr>
<td>type</td>
<td>linkedtonew</td>
<td>http://www.mahara.org/</td>
<td>https://mahara.org/</td>
</tr>
<tr>
<td>waitForValue</td>
......@@ -50,7 +50,7 @@
<tr>
<td>waitForValue</td>
<td>linkedtonew</td>
<td>http://www.mahara.org/</td>
<td>https://mahara.org/</td>
</tr>
<tr>
<td>click</td>
......@@ -65,7 +65,7 @@
<tr>
<td>assertText</td>
<td>//tr/td[3]/a</td>
<td>exact:http://www.mahara.org/</td>
<td>exact:https://mahara.org/</td>
</tr>
</tbody></table>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment