Commit 3769fe88 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Enable auto_escape in header & footer and fix PAGEHEADING var to avoid double escaping


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 566360c2
...@@ -189,7 +189,7 @@ $smarty = smarty(array('paginator')); ...@@ -189,7 +189,7 @@ $smarty = smarty(array('paginator'));
$smarty->assign('options', $options); $smarty->assign('options', $options);
$smarty->assign('type', $type); $smarty->assign('type', $type);
$smarty->assign('INLINEJAVASCRIPT', $javascript); $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('PAGEHEADING', hsc(get_string('inbox'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('deleteall', $deleteall); $smarty->assign('deleteall', $deleteall);
$smarty->assign('activitylist', $activitylist); $smarty->assign('activitylist', $activitylist);
$smarty->display('account/activity/index.tpl'); $smarty->display('account/activity/index.tpl');
......
...@@ -100,7 +100,7 @@ $prefsform = pieform(array( ...@@ -100,7 +100,7 @@ $prefsform = pieform(array(
$smarty = smarty(); $smarty = smarty();
$smarty->assign('pagedescription', get_string('prefsdescr', 'activity')); $smarty->assign('pagedescription', get_string('prefsdescr', 'activity'));
$smarty->assign('form', $prefsform); $smarty->assign('form', $prefsform);
$smarty->assign('PAGEHEADING', hsc(get_string('notifications'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('form.tpl'); $smarty->display('form.tpl');
function activityprefs_submit(Pieform $form, $values) { function activityprefs_submit(Pieform $form, $values) {
......
...@@ -318,7 +318,7 @@ function clearPasswords(form, data) { ...@@ -318,7 +318,7 @@ function clearPasswords(form, data) {
} }
} }
"); ");
$smarty->assign('PAGEHEADING', hsc(get_string('account'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/index.tpl'); $smarty->display('account/index.tpl');
......
...@@ -247,7 +247,7 @@ $smarty->assign('memberform', $memberform); ...@@ -247,7 +247,7 @@ $smarty->assign('memberform', $memberform);
$smarty->assign('requestedform', $requestedform); $smarty->assign('requestedform', $requestedform);
$smarty->assign('invitedform', $invitedform); $smarty->assign('invitedform', $invitedform);
$smarty->assign('joinform', $joinform); $smarty->assign('joinform', $joinform);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/institutions.tpl'); $smarty->display('account/institutions.tpl');
?> ?>
...@@ -66,7 +66,7 @@ $smarty = smarty(); ...@@ -66,7 +66,7 @@ $smarty = smarty();
$smarty->assign('reloadform', $reloadform); $smarty->assign('reloadform', $reloadform);
$smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom')); $smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom'));
$smarty->assign('filters', $filters); $smarty->assign('filters', $filters);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/filters.tpl'); $smarty->display('admin/extensions/filters.tpl');
?> ?>
...@@ -122,7 +122,7 @@ $heading = get_string('pluginadmin', 'admin') . ': ' . $plugintype . ': ' . $plu ...@@ -122,7 +122,7 @@ $heading = get_string('pluginadmin', 'admin') . ': ' . $plugintype . ': ' . $plu
if ($type) { if ($type) {
$heading .= ': ' . $type; $heading .= ': ' . $type;
} }
$smarty->assign('PAGEHEADING', hsc($heading)); $smarty->assign('PAGEHEADING', $heading);
$smarty->display('admin/extensions/pluginconfig.tpl'); $smarty->display('admin/extensions/pluginconfig.tpl');
......
...@@ -194,7 +194,7 @@ $smarty = smarty(); ...@@ -194,7 +194,7 @@ $smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $javascript); $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('plugins', $plugins); $smarty->assign('plugins', $plugins);
$smarty->assign('installlink', 'installplugin'); $smarty->assign('installlink', 'installplugin');
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/plugins.tpl'); $smarty->display('admin/extensions/plugins.tpl');
?> ?>
...@@ -79,7 +79,7 @@ if (empty($upgrades)) { ...@@ -79,7 +79,7 @@ if (empty($upgrades)) {
} }
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(get_string('administration', 'admin'))); $smarty->assign('PAGEHEADING', get_string('administration', 'admin'));
// normal admin page starts here // normal admin page starts here
$smarty->assign('upgrades', $upgrades); $smarty->assign('upgrades', $upgrades);
......
...@@ -316,7 +316,7 @@ $smarty = smarty(); ...@@ -316,7 +316,7 @@ $smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $ijs); $smarty->assign('INLINEJAVASCRIPT', $ijs);
$smarty->assign('MENUS', $menulist); $smarty->assign('MENUS', $menulist);
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'artefact/file/sitefiles.php">', '</a>')); $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'artefact/file/sitefiles.php">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string('linksandresourcesmenu', 'admin'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('footerform', $footerform); $smarty->assign('footerform', $footerform);
$smarty->display('admin/site/menu.tpl'); $smarty->display('admin/site/menu.tpl');
......
...@@ -213,7 +213,7 @@ function networkingform_submit(Pieform $form, $values) { ...@@ -213,7 +213,7 @@ function networkingform_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('networkingform', $networkingform); $smarty->assign('networkingform', $networkingform);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/networking.tpl'); $smarty->display('admin/site/networking.tpl');
?> ?>
...@@ -462,7 +462,7 @@ function siteoptions_submit(Pieform $form, $values) { ...@@ -462,7 +462,7 @@ function siteoptions_submit(Pieform $form, $values) {
$thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php'); $thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php');
$smarty = smarty(array('adminsiteoptions')); $smarty = smarty(array('adminsiteoptions'));
$smarty->assign('siteoptionform', $siteoptionform); $smarty->assign('siteoptionform', $siteoptionform);
$smarty->assign('PAGEHEADING', hsc(get_string('siteoptions', 'admin'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/options.tpl'); $smarty->display('admin/site/options.tpl');
?> ?>
...@@ -96,7 +96,7 @@ function editsitepage_submit(Pieform $form, $values) { ...@@ -96,7 +96,7 @@ function editsitepage_submit(Pieform $form, $values) {
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits'))); $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
$smarty->assign('pageeditform', $form); $smarty->assign('pageeditform', $form);
$smarty->assign('PAGEHEADING', hsc(get_string('editsitepages', 'admin'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl'); $smarty->display('admin/site/pages.tpl');
?> ?>
...@@ -45,7 +45,7 @@ define('TITLE', $title); ...@@ -45,7 +45,7 @@ define('TITLE', $title);
$createviewform = pieform(create_view_form(null, 'mahara')); $createviewform = pieform(create_view_form(null, 'mahara'));
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$data = View::get_myviews_data($limit, $offset, null, 'mahara'); $data = View::get_myviews_data($limit, $offset, null, 'mahara');
......
...@@ -64,7 +64,7 @@ addLoadEvent(function () { ...@@ -64,7 +64,7 @@ addLoadEvent(function () {
EOF; EOF;
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('sitedata', $sitedata); $smarty->assign('sitedata', $sitedata);
......
...@@ -327,7 +327,7 @@ function adduser_submit(Pieform $form, $values) { ...@@ -327,7 +327,7 @@ function adduser_submit(Pieform $form, $values) {
$smarty = smarty(array('adminadduser')); $smarty = smarty(array('adminadduser'));
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/add.tpl'); $smarty->display('admin/users/add.tpl');
?> ?>
...@@ -86,7 +86,7 @@ function adminusers_submit(Pieform $form, $values) { ...@@ -86,7 +86,7 @@ function adminusers_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('adminusersform', $form); $smarty->assign('adminusersform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/admin.tpl'); $smarty->display('admin/users/admin.tpl');
?> ?>
...@@ -104,5 +104,5 @@ $form = pieform($form); ...@@ -104,5 +104,5 @@ $form = pieform($form);
$smarty = smarty(); $smarty = smarty();
$smarty->assign('bulkexportform', $form); $smarty->assign('bulkexportform', $form);
$smarty->assign('bulkexportdescription', get_string('bulkexportdescription', 'admin')); $smarty->assign('bulkexportdescription', get_string('bulkexportdescription', 'admin'));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkexport.tpl'); $smarty->display('admin/users/bulkexport.tpl');
...@@ -386,5 +386,5 @@ $form = pieform($form); ...@@ -386,5 +386,5 @@ $form = pieform($form);
$smarty = smarty(); $smarty = smarty();
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkimport.tpl'); $smarty->display('admin/users/bulkimport.tpl');
...@@ -516,7 +516,7 @@ if ($id != $USER->get('id') && is_null($USER->get('parentuser'))) { ...@@ -516,7 +516,7 @@ if ($id != $USER->get('id') && is_null($USER->get('parentuser'))) {
$loginas = null; $loginas = null;
} }
$smarty->assign('loginas', $loginas); $smarty->assign('loginas', $loginas);
$smarty->assign('PAGEHEADING', hsc(TITLE . ': ' . display_name($user))); $smarty->assign('PAGEHEADING', TITLE . ': ' . display_name($user));
$smarty->display('admin/users/edit.tpl'); $smarty->display('admin/users/edit.tpl');
?> ?>
...@@ -106,7 +106,7 @@ function adminusers_submit(Pieform $form, $values) { ...@@ -106,7 +106,7 @@ function adminusers_submit(Pieform $form, $values) {
$smarty->assign('institutionselector', $s['institutionselector']); $smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']); $smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']);
$smarty->assign('adminusersform', pieform($form)); $smarty->assign('adminusersform', pieform($form));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionadmins.tpl'); $smarty->display('admin/users/institutionadmins.tpl');
?> ?>
...@@ -578,7 +578,7 @@ if ($institution && $institution != 'mahara') { ...@@ -578,7 +578,7 @@ if ($institution && $institution != 'mahara') {
} }
} }
$smarty->assign('PAGEHEADING', hsc(get_string('admininstitutions', 'admin'))); $smarty->assign('PAGEHEADING', get_string('admininstitutions', 'admin'));
$smarty->display('admin/users/institutions.tpl'); $smarty->display('admin/users/institutions.tpl');
function theme_sort($a, $b) { function theme_sort($a, $b) {
......
...@@ -104,7 +104,7 @@ function staffusers_submit(Pieform $form, $values) { ...@@ -104,7 +104,7 @@ function staffusers_submit(Pieform $form, $values) {
$smarty->assign('institutionselector', $s['institutionselector']); $smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']); $smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']);
$smarty->assign('staffusersform', pieform($form)); $smarty->assign('staffusersform', pieform($form));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionstaff.tpl'); $smarty->display('admin/users/institutionstaff.tpl');
?> ?>
...@@ -233,7 +233,7 @@ $smarty->assign('INLINEJAVASCRIPT', $js); ...@@ -233,7 +233,7 @@ $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector); $smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions'.$usertype, 'admin')); $smarty->assign('instructions', get_string('institutionusersinstructions'.$usertype, 'admin'));
$smarty->assign('institutionusersform', $userlistform); $smarty->assign('institutionusersform', $userlistform);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionusers.tpl'); $smarty->display('admin/users/institutionusers.tpl');
?> ?>
...@@ -88,7 +88,7 @@ if ($userinstitutions) { ...@@ -88,7 +88,7 @@ if ($userinstitutions) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('users', $users); $smarty->assign('users', $users);
$smarty->assign('types', $types); $smarty->assign('types', $types);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/notifications.tpl'); $smarty->display('admin/users/notifications.tpl');
......
...@@ -59,7 +59,7 @@ $smarty->assign('search', $search); ...@@ -59,7 +59,7 @@ $smarty->assign('search', $search);
$smarty->assign('alphabet', explode(',', get_string('alphabet'))); $smarty->assign('alphabet', explode(',', get_string('alphabet')));
$smarty->assign('institutions', $institutions); $smarty->assign('institutions', $institutions);
$smarty->assign('results', build_admin_user_search_results($search, $offset, $limit, $sortby, $sortdir)); $smarty->assign('results', build_admin_user_search_results($search, $offset, $limit, $sortby, $sortdir));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/search.tpl'); $smarty->display('admin/users/search.tpl');
?> ?>
...@@ -83,7 +83,7 @@ function staffusers_submit(Pieform $form, $values) { ...@@ -83,7 +83,7 @@ function staffusers_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('staffusersform', $form); $smarty->assign('staffusersform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/staff.tpl'); $smarty->display('admin/users/staff.tpl');
?> ?>
...@@ -79,7 +79,7 @@ $form = new Pieform(array( ...@@ -79,7 +79,7 @@ $form = new Pieform(array(
)); ));
$smarty->assign('buttonformopen', $form->get_form_tag()); $smarty->assign('buttonformopen', $form->get_form_tag());
$smarty->assign('buttonform', $form->build(false)); $smarty->assign('buttonform', $form->build(false));
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/suspended.tpl'); $smarty->display('admin/users/suspended.tpl');
function buttons_submit_unsuspend(Pieform $form, $values) { function buttons_submit_unsuspend(Pieform $form, $values) {
......
...@@ -365,7 +365,7 @@ $form = pieform($form); ...@@ -365,7 +365,7 @@ $form = pieform($form);
$smarty = smarty(); $smarty = smarty();
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription); $smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form); $smarty->assign('uploadcsvform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/uploadcsv.tpl'); $smarty->display('admin/users/uploadcsv.tpl');
?> ?>
...@@ -56,7 +56,7 @@ ArtefactTypeBlog::build_blog_list_html($blogs); ...@@ -56,7 +56,7 @@ ArtefactTypeBlog::build_blog_list_html($blogs);
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
$smarty->assign_by_ref('blogs', $blogs); $smarty->assign_by_ref('blogs', $blogs);
$smarty->assign('PAGEHEADING', hsc(get_string("myblogs", "artefact.blog"))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', 'addLoadEvent(function() {' . $blogs->pagination_js . '});'); $smarty->assign('INLINEJAVASCRIPT', 'addLoadEvent(function() {' . $blogs->pagination_js . '});');
$smarty->display('artefact:blog:index.tpl'); $smarty->display('artefact:blog:index.tpl');
......
...@@ -79,7 +79,7 @@ $form = pieform(array( ...@@ -79,7 +79,7 @@ $form = pieform(array(
$smarty =& smarty(); $smarty =& smarty();
$smarty->assign_by_ref('form', $form); $smarty->assign_by_ref('form', $form);
$smarty->assign_by_ref('PAGEHEADING', hsc(TITLE)); $smarty->assign_by_ref('PAGEHEADING', TITLE);
$smarty->display('form.tpl'); $smarty->display('form.tpl');
exit; exit;
......
...@@ -338,7 +338,7 @@ $smarty = smarty(array(), array(), array(), array( ...@@ -338,7 +338,7 @@ $smarty = smarty(array(), array(), array(), array(
)); ));
$smarty->assign('INLINEJAVASCRIPT', $javascript); $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign_by_ref('form', $form); $smarty->assign_by_ref('form', $form);
$smarty->assign('PAGEHEADING', hsc($pagetitle)); $smarty->assign('PAGEHEADING', $pagetitle);
$smarty->display('artefact:blog:editpost.tpl'); $smarty->display('artefact:blog:editpost.tpl');
......
...@@ -91,7 +91,7 @@ $form = pieform(array( ...@@ -91,7 +91,7 @@ $form = pieform(array(
$smarty = smarty(); $smarty = smarty();
$smarty->assign_by_ref('editform', $form); $smarty->assign_by_ref('editform', $form);
$smarty->assign_by_ref('blog', $blog); $smarty->assign_by_ref('blog', $blog);
$smarty->assign_by_ref('PAGEHEADING', hsc(TITLE)); $smarty->assign_by_ref('PAGEHEADING', TITLE);
$smarty->display('artefact:blog:settings.tpl'); $smarty->display('artefact:blog:settings.tpl');
exit; exit;
......
...@@ -62,7 +62,7 @@ if ($blog->count_children()) { ...@@ -62,7 +62,7 @@ if ($blog->count_children()) {
$smarty = smarty(array('tablerenderer')); $smarty = smarty(array('tablerenderer'));
$smarty->assign_by_ref('blog', $blog); $smarty->assign_by_ref('blog', $blog);
$smarty->assign_by_ref('INLINEJAVASCRIPT', $js); $smarty->assign_by_ref('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', hsc($blog->get('title'))); $smarty->assign('PAGEHEADING', $blog->get('title'));
$smarty->assign('strnopostsaddone', $smarty->assign('strnopostsaddone',
get_string('nopostsaddone', 'artefact.blog', get_string('nopostsaddone', 'artefact.blog',
'<a href="' . get_config('wwwroot') . 'artefact/blog/post.php?blog=' . $blog->get('id') . '">', '</a>')); '<a href="' . get_config('wwwroot') . 'artefact/blog/post.php?blog=' . $blog->get('id') . '">', '</a>'));
......
...@@ -112,7 +112,7 @@ function edit_comment_submit(Pieform $form, $values) { ...@@ -112,7 +112,7 @@ function edit_comment_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('strdescription', get_string('editcommentdescription', 'artefact.comment', $maxage)); $smarty->assign('strdescription', get_string('editcommentdescription', 'artefact.comment', $maxage));
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->display('artefact:comment:edit.tpl'); $smarty->display('artefact:comment:edit.tpl');
......
...@@ -107,7 +107,7 @@ if ($fileid) { ...@@ -107,7 +107,7 @@ if ($fileid) {
$smarty->assign('zipinfo', $zipinfo); $smarty->assign('zipinfo', $zipinfo);
$smarty->assign('message', $message); $smarty->assign('message', $message);
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:extract.tpl'); $smarty->display('artefact:file:extract.tpl');
} }
......
...@@ -53,7 +53,7 @@ $smarty = smarty( ...@@ -53,7 +53,7 @@ $smarty = smarty(
) )
); );
$smarty->assign('PAGEHEADING', hsc(get_string('myfiles', 'artefact.file'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:file:files.tpl'); $smarty->display('artefact:file:files.tpl');
......
...@@ -64,7 +64,7 @@ $smarty->assign('institution', $institution); ...@@ -64,7 +64,7 @@ $smarty->assign('institution', $institution);
$smarty->assign('institutionselector', $s['institutionselector']); $smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs'] . $js); $smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs'] . $js);
$smarty->assign('PAGEHEADING', hsc(TITLE)); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:files.tpl'); $smarty->display('artefact:file:files.tpl');
?> ?>
...@@ -305,7 +305,7 @@ $smarty->assign('uploadform', $uploadform); ...@@ -305,7 +305,7 @@ $smarty->assign('uploadform', $uploadform);
// the buttons need to be inside the tablerenderer. // the buttons need to be inside the tablerenderer.
$smarty->assign('settingsformtag', $settingsform->get_form_tag()); $smarty->assign('settingsformtag', $settingsform->get_form_tag());
$smarty->assign('imagemaxdimensions', array(get_config('imagemaxwidth'), get_config('imagemaxheight'))); $smarty->assign('imagemaxdimensions', array(get_config('imagemaxwidth'), get_config('imagemaxheight')));
$smarty->assign('PAGEHEADING', hsc(get_string('profileicons', 'artefact.file'))); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:profileicons.tpl'); $smarty->display('artefact:file:profileicons.tpl');
?> ?>
...@@ -41,7 +41,7 @@ $js = ArtefactTypeFileBase::files_js(); ...@@ -41,7 +41,7 @@ $js = ArtefactTypeFileBase::files_js();
$smarty = smarty(); $smarty = smarty();
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>')); $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string('sitefiles', 'admin'))); $smarty->assign('PAGEHEADING', TITLE);