Commit 1c56a922 authored by Aaron Wells's avatar Aaron Wells Committed by Son Nguyen

Making links to directory index.php files more explicit

Bug #1150831: Some links to directory index.php files left off the
trailing slash,
i.e. "{$WWWROOT}/view". This caused unnecessary redirects and greater
potential for
errors in users' web server setups. While I was at it, for all links to
directories
other than $WWWROOT itself, I changed them to be explicitly links to
"index.php".

Also fixed the Windows-style line endings in homeinfo.tpl

Fix all implicit links

Change-Id: I87b285713e5cb1cfe785ceedd2702e5c2578058b
parent 7639518c
......@@ -62,7 +62,7 @@ foreach ($activitytypes as $type) {
$section = 'activity';
}
if ($dv == 'email' && !isset($maildisabledmsg) && get_account_preference($USER->get('id'),'maildisabled')) {
$SESSION->add_error_msg(get_string('maildisableddescription', 'account', get_config('wwwroot') . 'account/'), false);
$SESSION->add_error_msg(get_string('maildisableddescription', 'account', get_config('wwwroot') . 'account/index.php'), false);
$maildisabledmsg = true;
}
$elements['activity_'.$type->id] = array(
......
......@@ -54,7 +54,7 @@ function account_delete_submit(Pieform $form, $values) {
$USER->logout();
delete_user($userid);
$SESSION->add_ok_msg(get_string('accountdeleted', 'account'));
redirect('/');
redirect('/index.php');
}
$smarty = smarty();
......
......@@ -35,7 +35,7 @@ require(dirname(dirname(dirname(__FILE__))) . '/init.php');
safe_require('artefact', 'blog');
if (!$USER->get_account_preference('multipleblogs')) {
redirect(get_config('wwwroot') . 'artefact/blog/view/');
redirect(get_config('wwwroot') . 'artefact/blog/view/index.php');
}
define('TITLE', get_string('blogs','artefact.blog'));
......@@ -70,5 +70,5 @@ function delete_blog_submit(Pieform $form, $values) {
$blog->delete();
$SESSION->add_ok_msg(get_string('blogdeleted', 'artefact.blog'));
}
redirect('/artefact/blog/');
redirect('/artefact/blog/index.php');
}
......@@ -83,7 +83,7 @@ $string['newattachmentsexceedquota'] = 'The total size of the new files that you
$string['newblog'] = 'New journal';
$string['newblogpost'] = 'New journal entry in journal "%s"';
$string['newerposts'] = 'Newer entries';
$string['nodefaultblogfound'] = 'No default journal found. This is a bug in the system. To fix it, you need to enable the multiple journals option on the <a href="%saccount/">account settings</a> page.';
$string['nodefaultblogfound'] = 'No default journal found. This is a bug in the system. To fix it, you need to enable the multiple journals option on the <a href="%saccount/index.php">account settings</a> page.';
$string['nopostsyet'] = 'No entries yet.';
$string['noimageshavebeenattachedtothispost'] = 'No images have been attached to this entry. You need to upload or attach an image to the entry before you can insert it.';
$string['nofilesattachedtothispost'] = 'No attached files';
......@@ -149,8 +149,8 @@ $string['youhaveblogs'] = 'You have %s journals.';
$string['feedsnotavailable'] = 'Feeds are not available for this artefact type.';
$string['feedrights'] = 'Copyright %s.';
$string['enablemultipleblogstext'] = 'You have one journal. If you would like to start a second one, enable the multiple journals option on the <a href="%saccount/">account settings</a> page.';
$string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option activated. You can enable it on the <a href="%saccount/">account settings</a> page.';
$string['enablemultipleblogstext'] = 'You have one journal. If you would like to start a second one, enable the multiple journals option on the <a href="%saccount/index.php">account settings</a> page.';
$string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option activated. You can enable it on the <a href="%saccount/index.php">account settings</a> page.';
$string['shortcutaddpost'] = 'Add a new entry to';
$string['shortcutgo'] = 'Go';
......
......@@ -54,11 +54,11 @@ class PluginArtefactBlog extends PluginArtefact {
'weight' => 40,
);
if ($USER->get_account_preference('multipleblogs')) {
$tab['url'] = 'artefact/blog/';
$tab['url'] = 'artefact/blog/index.php';
$tab['title'] = get_string('blogs', 'artefact.blog');
}
else {
$tab['url'] = 'artefact/blog/view/';
$tab['url'] = 'artefact/blog/view/index.php';
$tab['title'] = get_string('blog', 'artefact.blog');
}
return array('content/blogs' => $tab);
......@@ -377,8 +377,8 @@ class ArtefactTypeBlog extends ArtefactType {
$wwwroot = get_config('wwwroot');
return array(
'_default' => $wwwroot . 'artefact/blog/view/?id=' . $id,
get_string('blogsettings', 'artefact.blog') => $wwwroot . 'artefact/blog/settings/?id=' . $id,
'_default' => $wwwroot . 'artefact/blog/view/index.php?id=' . $id,
get_string('blogsettings', 'artefact.blog') => $wwwroot . 'artefact/blog/settings/index.php?id=' . $id,
);
}
......@@ -440,7 +440,7 @@ class ArtefactTypeBlog extends ArtefactType {
$SESSION->add_ok_msg(get_string('copiedblogpoststonewjournal', 'collection'));
}
catch (Exception $e) {
$SESSION->add_error_msg(get_string('unabletosetmultipleblogs', 'error', $user->username, $viewid, get_config('wwwroot') . 'account/'), false);
$SESSION->add_error_msg(get_string('unabletosetmultipleblogs', 'error', $user->username, $viewid, get_config('wwwroot') . 'account/index.php'), false);
}
try {
......@@ -996,7 +996,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
$SESSION->add_ok_msg(get_string('copiedblogpoststonewjournal', 'collection'));
}
catch (Exception $e) {
$SESSION->add_error_msg(get_string('unabletosetmultipleblogs', 'error', $user->username, $viewid, get_config('wwwroot') . 'account/'), false);
$SESSION->add_error_msg(get_string('unabletosetmultipleblogs', 'error', $user->username, $viewid, get_config('wwwroot') . 'account/index.php'), false);
}
try {
......
......@@ -93,12 +93,12 @@ function newblog_submit(Pieform $form, $values) {
global $USER;
ArtefactTypeBlog::new_blog($USER, $values);
redirect('/artefact/blog/');
redirect('/artefact/blog/index.php');
}
/**
* This function gets called to cancel a submission.
*/
function newblog_cancel_submit() {
redirect('/artefact/blog/');
redirect('/artefact/blog/index.php');
}
......@@ -280,7 +280,7 @@ $smarty->display('artefact:blog:editpost.tpl');
*/
function editpost_cancel_submit() {
global $blog;
redirect(get_config('wwwroot') . 'artefact/blog/view/?id=' . $blog);
redirect(get_config('wwwroot') . 'artefact/blog/view/index.php?id=' . $blog);
}
function editpost_submit(Pieform $form, $values) {
......
......@@ -117,7 +117,7 @@ function editblog_submit(Pieform $form, $values) {
ArtefactTypeBlog::edit_blog($USER, $values);
redirect('/artefact/blog/view/?id=' . $values['id']);
redirect('/artefact/blog/view/index.php?id=' . $values['id']);
}
/**
......@@ -126,5 +126,5 @@ function editblog_submit(Pieform $form, $values) {
*/
function editblog_cancel_submit() {
$id = param_integer('id');
redirect('/artefact/blog/view/?id=' . $id);
redirect('/artefact/blog/view/index.php?id=' . $id);
}
......@@ -2,18 +2,18 @@
<tr class="{cycle name=rows values='r0,r1'}">
<td colspan="2">
<div class="fr">
<span class="entries"><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{str tag=nposts section=artefact.blog arg1=$blog->postcount}</a></span>
<span class="entries"><a href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">{str tag=nposts section=artefact.blog arg1=$blog->postcount}</a></span>
<span class="newentry"><a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn">{str tag=addpost section=artefact.blog}</a></span>
<span class="btns2">
{if $blog->locked}
<span class="s dull">{str tag=submittedforassessment section=view}</span>
{else}
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->id}" title="{str tag=settings}"><img src="{theme_url filename='images/manage.gif'}" alt="{str tag=settings}"></a>
<a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str tag=settings}"><img src="{theme_url filename='images/manage.gif'}" alt="{str tag=settings}"></a>
{$blog->deleteform|safe}
{/if}
</span>
</div>
<h4><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->title}</a></h4>
<h4><a href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">{$blog->title}</a></h4>
<div id="blogdesc">{$blog->description|clean_html|safe}</div>
</td>
</tr>
......
{include file="header.tpl"}
<div class="rbuttons">
<a class="btn" href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
<a class="btn" href="{$WWWROOT}artefact/blog/new/index.php">{str section="artefact.blog" tag="addblog"}</a>
</div>
<div id="myblogs rel">
{if !$blogs->data}
......
......@@ -4,7 +4,7 @@
<div class="rbuttons">
<a class="btn addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
{if !$blog->get('locked')}
<a class="btn settings" href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
<a class="btn settings" href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
{/if}
</div>
......
......@@ -131,7 +131,7 @@ function changepoststatus_submit(Pieform $form, $values) {
}
$form->reply(PIEFORM_OK, array(
'message' => $strmessage,
'goto' => get_config('wwwroot') . 'artefact/blog/view/?id=' . $blogpost->get('parent'),
'goto' => get_config('wwwroot') . 'artefact/blog/view/index.php?id=' . $blogpost->get('parent'),
'id' => $values['changepoststatus'],
));
}
......@@ -145,7 +145,7 @@ function delete_submit(Pieform $form, $values) {
$blogpost->delete();
$form->reply(PIEFORM_OK, array(
'message' => get_string('blogpostdeleted', 'artefact.blog'),
'goto' => get_config('wwwroot') . 'artefact/blog/view/?id=' . $blogpost->get('parent'),
'goto' => get_config('wwwroot') . 'artefact/blog/view/index.php?id=' . $blogpost->get('parent'),
'id' => $values['delete'],
));
}
......@@ -31,7 +31,7 @@ safe_require('artefact', 'file');
require_once(get_config('docroot') . '/lib/htmloutput.php');
if (!$unzip = $SESSION->get('unzip')) {
redirect('/artefact/file/');
redirect('/artefact/file/index.php');
}
if (function_exists('apache_setenv')) {
......
......@@ -138,7 +138,7 @@ function files_page($file) {
else if ($group = $file->get('group')) {
$url .= 'groupfiles.php?group=' . $group;
}
if ($institution = $file->get('institution')) {
else if ($institution = $file->get('institution')) {
if ($institution == 'mahara') {
$url .= 'sitefiles.php';
}
......@@ -146,6 +146,9 @@ function files_page($file) {
$url .= 'institutionfiles.php?institution=' . $institution;
}
}
else {
$url .= 'index.php';
}
return $url;
}
......
......@@ -53,7 +53,7 @@ class PluginArtefactFile extends PluginArtefact {
return array(
'content/files' => array(
'path' => 'content/files',
'url' => 'artefact/file/',
'url' => 'artefact/file/index.php',
'title' => get_string('Files', 'artefact.file'),
'weight' => 30,
),
......@@ -1549,7 +1549,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
return array(
'_default' => $wwwroot . 'artefact/file/download.php?file=' . $id,
get_string('folder', 'artefact.file') => $wwwroot . 'artefact/file/?folder=' . $id,
get_string('folder', 'artefact.file') => $wwwroot . 'artefact/file/index.php?folder=' . $id,
);
}
......@@ -1813,7 +1813,7 @@ class ArtefactTypeFolder extends ArtefactTypeFileBase {
$wwwroot = get_config('wwwroot');
return array(
'_default' => $wwwroot . 'artefact/file/?folder=' . $id,
'_default' => $wwwroot . 'artefact/file/index.php?folder=' . $id,
);
}
......
......@@ -146,7 +146,7 @@ if ($items['firstname']) {
$items['maildisabled']['ignore'] = !get_account_preference($USER->get('id'),'maildisabled');
$items['maildisabled']['value'] = get_string('maildisableddescription', 'account', get_config('wwwroot') . 'account/');
$items['maildisabled']['value'] = get_string('maildisableddescription', 'account', get_config('wwwroot') . 'account/index.php');
// build form elements
$elements = array(
......@@ -434,7 +434,7 @@ function profileform_reply($form, $code, $message) {
$method = 'add_ok_msg';
}
$SESSION->$method($message);
redirect('/artefact/internal/');
redirect('/artefact/internal/index.php');
}
// Should never be replying with an array for an OK message
}
......
......@@ -125,7 +125,7 @@ class PluginArtefactInternal extends PluginArtefact {
return array(
'content/profile' => array(
'path' => 'content/profile',
'url' => 'artefact/internal/',
'url' => 'artefact/internal/index.php',
'title' => get_string('profile', 'artefact.internal'),
'weight' => 10,
),
......@@ -521,7 +521,7 @@ class ArtefactTypeProfile extends ArtefactType {
$wwwroot = get_config('wwwroot');
return array(
'_default' => $wwwroot . 'artefact/internal/',
'_default' => $wwwroot . 'artefact/internal/index.php',
);
}
......
......@@ -49,7 +49,7 @@ $deleteform = array(
'submit' => array(
'type' => 'submitcancel',
'value' => array(get_string('deleteplan','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/plans/',
'goto' => get_config('wwwroot') . '/artefact/plans/index.php',
),
)
);
......@@ -69,5 +69,5 @@ function deleteplanform_submit(Pieform $form, $values) {
$todelete->delete();
$SESSION->add_ok_msg(get_string('plandeletedsuccessfully', 'artefact.plans'));
redirect('/artefact/plans/');
redirect('/artefact/plans/index.php');
}
......@@ -47,7 +47,7 @@ class PluginArtefactPlans extends PluginArtefact {
return array(
'content/plans' => array(
'path' => 'content/plans',
'url' => 'artefact/plans/',
'url' => 'artefact/plans/index.php',
'title' => get_string('Plans', 'artefact.plans'),
'weight' => 60,
),
......@@ -182,7 +182,7 @@ class ArtefactTypePlan extends ArtefactType {
redirect('/artefact/plans/plan.php?id='.$artefact->get('id'));
}
else {
redirect('/artefact/plans/');
redirect('/artefact/plans/index.php');
}
}
......@@ -197,7 +197,7 @@ class ArtefactTypePlan extends ArtefactType {
$elements['submit'] = array(
'type' => 'submitcancel',
'value' => array(get_string('saveplan','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/plans/',
'goto' => get_config('wwwroot') . 'artefact/plans/index.php',
);
$planform = array(
'name' => empty($plan) ? 'addplan' : 'editplan',
......
......@@ -86,7 +86,7 @@ class PluginBlocktypeResumefield extends PluginBlocktype {
$form[] = self::artefactchooser_element((isset($configdata['artefactid'])) ? $configdata['artefactid'] : null);
$form['message'] = array(
'type' => 'html',
'value' => get_string('filloutyourresume', 'blocktype.resume/resumefield', '<a href="' . get_config('wwwroot') . 'artefact/resume/">', '</a>'),
'value' => get_string('filloutyourresume', 'blocktype.resume/resumefield', '<a href="' . get_config('wwwroot') . 'artefact/resume/index.php">', '</a>'),
);
return $form;
......
......@@ -62,7 +62,7 @@ class PluginArtefactResume extends Plugin {
'content/resume' => array(
'path' => 'content/resume',
'title' => get_string('resume', 'artefact.resume'),
'url' => 'artefact/resume/',
'url' => 'artefact/resume/index.php',
'weight' => 50,
),
);
......@@ -1264,6 +1264,9 @@ function compositeformedit_submit(Pieform $form, $values) {
if (isset($tabs[$values['compositetype']])) {
$goto .= $tabs[$values['compositetype']] . '.php';
}
else {
$goto .='index.php';
}
try {
call_static_method(generate_artefact_class_name($values['compositetype']),
......
......@@ -249,7 +249,7 @@ function auth_saml_loginlink_submit(Pieform $form, $values) {
));
db_commit();
@session_write_close();
redirect('/auth/saml/');
redirect('/auth/saml/index.php');
}
......@@ -418,7 +418,7 @@ function saml_auth_generate_login_form() {
. '<a href="' . get_config('wwwroot') . 'forgotpass.php" tabindex="2">' . get_string('lostusernamepassword') . '</a></div>'
),
'loginsaml' => array(
'value' => ((count_records('auth_instance', 'authname', 'saml') == 0) ? '' : '<a href="' . get_config('wwwroot') . 'auth/saml/" tabindex="2">' . get_string('login', 'auth.saml') . '</a>')
'value' => ((count_records('auth_instance', 'authname', 'saml') == 0) ? '' : '<a href="' . get_config('wwwroot') . 'auth/saml/index.php" tabindex="2">' . get_string('login', 'auth.saml') . '</a>')
),
)
)));
......@@ -542,13 +542,13 @@ function auth_saml_login_submit(Pieform $form, $values) {
$authenticated = login_test_all_user_authinstance($username, $password);
if (empty($authenticated)) {
$SESSION->add_error_msg(get_string('loginfailed'));
redirect('/auth/saml/');
redirect('/auth/saml/index.php');
}
}
catch (AuthUnknownUserException $e) {
$SESSION->add_error_msg(get_string('loginfailed'));
redirect('/auth/saml/');
redirect('/auth/saml/index.php');
}
auth_check_admin_section();
......@@ -585,5 +585,5 @@ function auth_saml_login_submit(Pieform $form, $values) {
auth_check_required_fields();
// all happy - carry on now
redirect('/auth/saml/');
redirect('/auth/saml/index.php');
}
......@@ -262,7 +262,7 @@ class AuthSaml extends Auth {
$SESSION->set('wantsurl', null);
// redirect for logout of SAML 2.0 IdP
redirect($CFG->wwwroot.'/auth/saml/?logout=1');
redirect($CFG->wwwroot.'/auth/saml/index.php?logout=1');
}
public function after_auth_setup_page_hook() {
......@@ -611,7 +611,7 @@ class PluginAuthSaml extends PluginAuth {
public static function login_form_elements() {
$elements = array(
'loginsaml' => array(
'value' => '<div class="login-externallink"><a class="btn" href="' . get_config('wwwroot') . 'auth/saml/">' . get_string('login', 'auth.saml') . '</a></div>'
'value' => '<div class="login-externallink"><a class="btn" href="' . get_config('wwwroot') . 'auth/saml/index.php">' . get_string('login', 'auth.saml') . '</a></div>'
)
);
return $elements;
......
......@@ -15,7 +15,7 @@
</td>
<td>
{if $i->message}
<a href="{if $i->url}{$WWWROOT}{$i->url}{else}{$WWWROOT}account/activity{/if}" class="inbox-showmessage{if !$i->read} unread{/if}">{$i->subject}</a>
<a href="{if $i->url}{$WWWROOT}{$i->url}{else}{$WWWROOT}account/activity/index.php{/if}" class="inbox-showmessage{if !$i->read} unread{/if}">{$i->subject}</a>
<div class="inbox-message hidden messagebody messagebody-{$i->type}" id="inbox-message-{$i->id}">{$i->message|safe}
{if $i->url}<br><a href="{$WWWROOT}{$i->url}">{if $i->urltext}{$i->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
</div>
......@@ -29,7 +29,7 @@
{/foreach}
</table>
{if $desiredtypes}
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a></div>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}account/activity/index.php?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a></div>
<div class="cb"></div>
{/if}
<script>
......
......@@ -14,4 +14,4 @@
</tr>
</table>
{/if}
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/index.php?group={$group->id}">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
......@@ -15,6 +15,6 @@
</tr>
</table>
{/if}
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
<div class="morelinkwrap"><a class="morelink" href="{$WWWROOT}interaction/forum/index.php?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a></div>
<div class="cb"></div>
</div>
......@@ -44,7 +44,7 @@ if (function_exists('apache_setenv')) {
}
if (!$exportdata = $SESSION->get('exportdata')) {
redirect('/export/');
redirect('/export/index.php');
}
$SESSION->set('exportdata', '');
......@@ -104,7 +104,7 @@ $exporter->includefeedback = $exportdata['includefeedback'];
try {
$zipfile = $exporter->export();
} catch (SystemException $e) {
export_iframe_die($e->getMessage(), get_config('wwwroot') . 'view/');
export_iframe_die($e->getMessage(), get_config('wwwroot') . 'view/index.php');
}
// Store the filename in the session, and redirect the iframe to it to trigger
......@@ -112,7 +112,7 @@ try {
// but alas this is not possible for people without javascript.
$SESSION->set('exportfile', $exporter->get('exportdir') . $zipfile);
$continueurl = 'download.php';
$continueurljs = get_config('wwwroot') . 'export/';
$continueurljs = get_config('wwwroot') . 'export/index.php';
$result = $SESSION->get('messages');
if (empty($result)) {
$strexport = get_string('exportgeneratedsuccessfully1', 'export');
......
......@@ -351,7 +351,7 @@ if (!get_config('installed')) {
&& false === strpos($scriptfilename, 'admin/upgrade.json.php')
&& false === strpos($scriptfilename, 'admin/cli/install.php')
&& false === strpos($scriptfilename, 'admin/cli/upgrade.php')) {
redirect('/admin/');
redirect('/admin/index.php');
}
}
......
......@@ -41,7 +41,7 @@ if (!$forum) {
}
$goto = $USER->is_logged_in()
? ($subscriptiontype == 'forum') ? '/interaction/forum/view.php?id=' . $forum : '/interaction/forum/topic.php?id=' . $topic
: '/';
: '/index.php';
if ($key || $USER->is_logged_in()) {
// get record from forum subscriptions for this key
......@@ -72,4 +72,4 @@ if ($key || $USER->is_logged_in()) {
}
// Not logged in and no key provided
redirect('/');
redirect('/index.php');
......@@ -2738,7 +2738,7 @@ class View {
}
}
else {
$url = get_config('wwwroot') . 'view/';
$url = get_config('wwwroot') . 'view/index.php';
}
if (!empty($queryparams)) {
......@@ -4441,7 +4441,7 @@ function createview_cancel_submit(Pieform $form, $values) {
if (isset($values['institution'])) {
redirect(get_config('wwwroot') . 'view/institutionviews.php?institution=' . $values['institution']);
}
redirect(get_config('wwwroot') . 'view/');
redirect(get_config('wwwroot') . 'view/index.php');
}
function searchviews_submit(Pieform $form, $values) {
......
......@@ -1793,13 +1793,13 @@ function admin_nav() {
$menu = array(
'adminhome' => array(
'path' => 'adminhome',
'url' => 'admin/',
'url' => 'admin/index.php',
'title' => get_string('adminhome', 'admin'),
'weight' => 10,
),
'adminhome/home' => array(
'path' => 'adminhome/home',
'url' => 'admin/',
'url' => 'admin/index.php',
'title' => get_string('overview'),
'weight' => 10,
),
......@@ -2273,20 +2273,20 @@ function mahara_standard_nav() {
),
'content' => array(
'path' => 'content',
'url' => 'artefact/internal/', // @todo possibly do path aliasing and dispatch?
'url' => 'artefact/internal/index.php', // @todo possibly do path aliasing and dispatch?
'title' => get_string('Content'),
'weight' => 20,
),
'myportfolio' => array(
'path' => 'myportfolio',
'url' => 'view/',
'url' => 'view/index.php',
'title' => get_string('myportfolio'),
'weight' => 30,
'accesskey' => 'v',
),
'myportfolio/views' => array(
'path' => 'myportfolio/views',
'url' => 'view/',
'url' => 'view/index.php',
'title' => get_string('Views', 'view'),
'weight' => 10,
),
......@@ -2304,14 +2304,14 @@ function mahara_standard_nav() {
),
'myportfolio/export' => array(
'path' => 'myportfolio/export',
'url' => 'export/',
'url' => 'export/index.php',
'title' => get_string('Export', 'export'),
'weight' => 70,
'ignore' => !$exportenabled,
),
'myportfolio/collection' => array(
'path' => 'myportfolio/collection',
'url' => 'collection/',
'url' => 'collection/index.php',
'title' => get_string('Collections', 'collection'),
'weight' => 20,
),
......@@ -2424,7 +2424,7 @@ function right_nav() {
$menu = array(
'settings' => array(
'path' => 'settings',
'url' => 'account/',
'url' => 'account/index.php',
'title' => get_string('settings'),
'icon' => $THEME->get_url('images/settings.png'),
'alt' => get_string('settings'),
......@@ -2432,7 +2432,7 @@ function right_nav() {
),
'inbox' => array(
'path' => 'inbox',
'url' => 'account/activity',
'url' => 'account/activity/index.php',
'icon' => $THEME->get_url($unread ? 'images/newemail.gif' : 'images/email.gif'),
'alt' => get_string('inbox'),
'count' => $unread,
......@@ -2441,13 +2441,13 @@ function right_nav() {
),
'settings/account' => array(
'path' => 'settings/account',
'url' => 'account/',
'url' => 'account/index.php',
'title' => get_config('dropdownmenu') ? get_string('general') : get_string('account'),
'weight' => 10,
),
'settings/notifications' => array(
'path' => 'settings/notifications',
'url' => 'account/activity/preferences/',
'url' => 'account/activity/preferences/index.php',
'title' => get_string('notifications'),
'weight' => 30,
),
......
......@@ -88,7 +88,7 @@ class PluginNotificationEmail extends PluginNotification {