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

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'));
$smarty->assign('options', $options);
$smarty->assign('type', $type);
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('PAGEHEADING', hsc(get_string('inbox')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('deleteall', $deleteall);
$smarty->assign('activitylist', $activitylist);
$smarty->display('account/activity/index.tpl');
......
......@@ -100,7 +100,7 @@ $prefsform = pieform(array(
$smarty = smarty();
$smarty->assign('pagedescription', get_string('prefsdescr', 'activity'));
$smarty->assign('form', $prefsform);
$smarty->assign('PAGEHEADING', hsc(get_string('notifications')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('form.tpl');
function activityprefs_submit(Pieform $form, $values) {
......
......@@ -318,7 +318,7 @@ function clearPasswords(form, data) {
}
}
");
$smarty->assign('PAGEHEADING', hsc(get_string('account')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/index.tpl');
......
......@@ -247,7 +247,7 @@ $smarty->assign('memberform', $memberform);
$smarty->assign('requestedform', $requestedform);
$smarty->assign('invitedform', $invitedform);
$smarty->assign('joinform', $joinform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/institutions.tpl');
?>
......@@ -66,7 +66,7 @@ $smarty = smarty();
$smarty->assign('reloadform', $reloadform);
$smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom'));
$smarty->assign('filters', $filters);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/filters.tpl');
?>
......@@ -122,7 +122,7 @@ $heading = get_string('pluginadmin', 'admin') . ': ' . $plugintype . ': ' . $plu
if ($type) {
$heading .= ': ' . $type;
}
$smarty->assign('PAGEHEADING', hsc($heading));
$smarty->assign('PAGEHEADING', $heading);
$smarty->display('admin/extensions/pluginconfig.tpl');
......
......@@ -194,7 +194,7 @@ $smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('plugins', $plugins);
$smarty->assign('installlink', 'installplugin');
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/plugins.tpl');
?>
......@@ -79,7 +79,7 @@ if (empty($upgrades)) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(get_string('administration', 'admin')));
$smarty->assign('PAGEHEADING', get_string('administration', 'admin'));
// normal admin page starts here
$smarty->assign('upgrades', $upgrades);
......
......@@ -316,7 +316,7 @@ $smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $ijs);
$smarty->assign('MENUS', $menulist);
$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->display('admin/site/menu.tpl');
......
......@@ -213,7 +213,7 @@ function networkingform_submit(Pieform $form, $values) {
$smarty = smarty();
$smarty->assign('networkingform', $networkingform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/networking.tpl');
?>
......@@ -462,7 +462,7 @@ function siteoptions_submit(Pieform $form, $values) {
$thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php');
$smarty = smarty(array('adminsiteoptions'));
$smarty->assign('siteoptionform', $siteoptionform);
$smarty->assign('PAGEHEADING', hsc(get_string('siteoptions', 'admin')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/options.tpl');
?>
......@@ -96,7 +96,7 @@ function editsitepage_submit(Pieform $form, $values) {
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
$smarty->assign('pageeditform', $form);
$smarty->assign('PAGEHEADING', hsc(get_string('editsitepages', 'admin')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl');
?>
......@@ -45,7 +45,7 @@ define('TITLE', $title);
$createviewform = pieform(create_view_form(null, 'mahara'));
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$data = View::get_myviews_data($limit, $offset, null, 'mahara');
......
......@@ -64,7 +64,7 @@ addLoadEvent(function () {
EOF;
$smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('sitedata', $sitedata);
......
......@@ -327,7 +327,7 @@ function adduser_submit(Pieform $form, $values) {
$smarty = smarty(array('adminadduser'));
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/add.tpl');
?>
......@@ -86,7 +86,7 @@ function adminusers_submit(Pieform $form, $values) {
$smarty = smarty();
$smarty->assign('adminusersform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/admin.tpl');
?>
......@@ -104,5 +104,5 @@ $form = pieform($form);
$smarty = smarty();
$smarty->assign('bulkexportform', $form);
$smarty->assign('bulkexportdescription', get_string('bulkexportdescription', 'admin'));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkexport.tpl');
......@@ -386,5 +386,5 @@ $form = pieform($form);
$smarty = smarty();
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkimport.tpl');
......@@ -516,7 +516,7 @@ if ($id != $USER->get('id') && is_null($USER->get('parentuser'))) {
$loginas = null;
}
$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');
?>
......@@ -106,7 +106,7 @@ function adminusers_submit(Pieform $form, $values) {
$smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']);
$smarty->assign('adminusersform', pieform($form));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionadmins.tpl');
?>
......@@ -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');
function theme_sort($a, $b) {
......
......@@ -104,7 +104,7 @@ function staffusers_submit(Pieform $form, $values) {
$smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs']);
$smarty->assign('staffusersform', pieform($form));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionstaff.tpl');
?>
......@@ -233,7 +233,7 @@ $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions'.$usertype, 'admin'));
$smarty->assign('institutionusersform', $userlistform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionusers.tpl');
?>
......@@ -88,7 +88,7 @@ if ($userinstitutions) {
$smarty = smarty();
$smarty->assign('users', $users);
$smarty->assign('types', $types);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/notifications.tpl');
......
......@@ -59,7 +59,7 @@ $smarty->assign('search', $search);
$smarty->assign('alphabet', explode(',', get_string('alphabet')));
$smarty->assign('institutions', $institutions);
$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');
?>
......@@ -83,7 +83,7 @@ function staffusers_submit(Pieform $form, $values) {
$smarty = smarty();
$smarty->assign('staffusersform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/staff.tpl');
?>
......@@ -79,7 +79,7 @@ $form = new Pieform(array(
));
$smarty->assign('buttonformopen', $form->get_form_tag());
$smarty->assign('buttonform', $form->build(false));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/suspended.tpl');
function buttons_submit_unsuspend(Pieform $form, $values) {
......
......@@ -365,7 +365,7 @@ $form = pieform($form);
$smarty = smarty();
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/uploadcsv.tpl');
?>
......@@ -56,7 +56,7 @@ ArtefactTypeBlog::build_blog_list_html($blogs);
$smarty = smarty(array('paginator'));
$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->display('artefact:blog:index.tpl');
......
......@@ -79,7 +79,7 @@ $form = pieform(array(
$smarty =& smarty();
$smarty->assign_by_ref('form', $form);
$smarty->assign_by_ref('PAGEHEADING', hsc(TITLE));
$smarty->assign_by_ref('PAGEHEADING', TITLE);
$smarty->display('form.tpl');
exit;
......
......@@ -338,7 +338,7 @@ $smarty = smarty(array(), array(), array(), array(
));
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign_by_ref('form', $form);
$smarty->assign('PAGEHEADING', hsc($pagetitle));
$smarty->assign('PAGEHEADING', $pagetitle);
$smarty->display('artefact:blog:editpost.tpl');
......
......@@ -91,7 +91,7 @@ $form = pieform(array(
$smarty = smarty();
$smarty->assign_by_ref('editform', $form);
$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');
exit;
......
......@@ -62,7 +62,7 @@ if ($blog->count_children()) {
$smarty = smarty(array('tablerenderer'));
$smarty->assign_by_ref('blog', $blog);
$smarty->assign_by_ref('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', hsc($blog->get('title')));
$smarty->assign('PAGEHEADING', $blog->get('title'));
$smarty->assign('strnopostsaddone',
get_string('nopostsaddone', 'artefact.blog',
'<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) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('strdescription', get_string('editcommentdescription', 'artefact.comment', $maxage));
$smarty->assign('form', $form);
$smarty->display('artefact:comment:edit.tpl');
......
......@@ -107,7 +107,7 @@ if ($fileid) {
$smarty->assign('zipinfo', $zipinfo);
$smarty->assign('message', $message);
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:extract.tpl');
}
......
......@@ -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('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:file:files.tpl');
......
......@@ -64,7 +64,7 @@ $smarty->assign('institution', $institution);
$smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs'] . $js);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:files.tpl');
?>
......@@ -305,7 +305,7 @@ $smarty->assign('uploadform', $uploadform);
// the buttons need to be inside the tablerenderer.
$smarty->assign('settingsformtag', $settingsform->get_form_tag());
$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');
?>
......@@ -41,7 +41,7 @@ $js = ArtefactTypeFileBase::files_js();
$smarty = smarty();
$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);
$smarty->assign('institution', 'mahara');
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js);
......
......@@ -440,7 +440,7 @@ $smarty = smarty(array('artefact/internal/js/profile.js'), array(), array(
$smarty->assign('profileform', $profileform);
$smarty->assign('PAGEHEADING', hsc(get_string('editprofile', 'artefact.internal')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:internal:index.tpl');
......
......@@ -87,7 +87,7 @@ else {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('message', $message);
$smarty->display('artefact:internal:validate.tpl');
......
......@@ -48,6 +48,6 @@ $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:achievements.tpl');
......@@ -43,7 +43,7 @@ $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:employment.tpl');
......
......@@ -102,7 +102,7 @@ $gform = array(
$goalform = pieform($gform);
$smarty = smarty();
$smarty->assign('goalform', $goalform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:goals.tpl');
......@@ -151,7 +151,7 @@ $personalinformationform = pieform(array(
$smarty = smarty();
$smarty->assign('coverletterform', $coverletterform);
$smarty->assign('personalinformationform',$personalinformationform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:index.tpl');
......
......@@ -73,7 +73,7 @@ $interestsform = pieform(array(
$smarty = smarty();
$smarty->assign('interestsform', $interestsform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:interests.tpl');
......
......@@ -97,7 +97,7 @@ $sform = array(
$skillform = pieform($sform);
$smarty = smarty();
$smarty->assign('skillform', $skillform);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:skills.tpl');
......@@ -971,7 +971,7 @@ function auth_draw_login_page($message=null, Pieform $form=null) {
}
$smarty = smarty(array(), array(), array(), array('pagehelp' => false, 'sidebars' => false));
$smarty->assign('login_form', $loginform);
$smarty->assign('PAGEHEADING', hsc(get_string('loginto', 'mahara', get_config('sitename'))));
$smarty->assign('PAGEHEADING', get_string('loginto', 'mahara', get_config('sitename')));
$smarty->display('login.tpl');
exit;
}
......
......@@ -73,7 +73,7 @@ function deletepost_submit(Pieform $form, $values) {
$smarty = smarty();
$smarty->assign('deleteform', $form);
$smarty->assign('PAGEHEADING', hsc(get_string('deletepost', 'blocktype.wall')));
$smarty->assign('PAGEHEADING', get_string('deletepost', 'blocktype.wall'));
$smarty->display('blocktype:wall:deletepost.tpl');
?>
......@@ -65,7 +65,7 @@ if ($tag = param_variable('tag', null)) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('tags', $tags);
if ($tag) {
$smarty->assign('tag', $tag);
......
......@@ -142,7 +142,7 @@ $smarty = smarty(
array(),
array('stylesheets' => array('style/views.css'))
);
$smarty->assign('PAGEHEADING', hsc(get_string('exportyourportfolio', 'export')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $form);
$smarty->display('export/index.tpl');
......
......@@ -89,7 +89,7 @@ $creategroup = pieform(array(
$smarty = smarty();
$smarty->assign('form', $creategroup);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('form.tpl');
......
......@@ -153,7 +153,7 @@ function search_submit(Pieform $form, $values) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $searchform);
$smarty->assign('groups', $groups['data']);
$smarty->assign('pagination', $pagination['html']);
......
......@@ -83,7 +83,7 @@ $smarty->assign('form', $form);
$smarty->assign('filter', $filter);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('searchingforgroups', array('<a href="' . get_config('wwwroot') . 'group/find.php">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string('mygroups')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('group/mygroups.tpl');
function filter_submit(Pieform $form, $values) {
......
......@@ -9,12 +9,12 @@
* @author Catalyst IT Ltd
* @version 1.0
*/
function Dwoo_Plugin_display_name(Dwoo $dwoo, $user) {
function Dwoo_Plugin_display_name(Dwoo $dwoo, $user, $userto=null, $nameonly=false, $realname=false) {
if (!$user) {
return '';
}
return display_name($user);
return display_name($user, $userto, $nameonly, $realname);
}
?>
......@@ -412,7 +412,7 @@ EOF;
$group = group_current_group();
$smarty->assign('GROUP', $group);
$smarty->assign('SUBPAGENAV', group_get_menu_tabs());
$smarty->assign('PAGEHEADING', hsc($group->name));
$smarty->assign('PAGEHEADING', $group->name);
}
// ---------- sideblock stuff ----------
......@@ -518,7 +518,7 @@ EOF;
if ($USER->get('parentuser')) {
$smarty->assign('USERMASQUERADING', true);
$smarty->assign('masqueradedetails', get_string('youaremasqueradingas', 'mahara', hsc(display_name($USER))));
$smarty->assign('masqueradedetails', get_string('youaremasqueradingas', 'mahara', display_name($USER)));
$smarty->assign('becomeyouagain',
' <a href="' . hsc($wwwroot) . 'admin/users/changeuser.php?restore=1">'
. get_string('becomeadminagain', 'admin', hsc($USER->get('parentuser')->name))
......
......@@ -397,7 +397,7 @@ $smarty->assign('registerdescription', $registerdescription);
if ($registerterms) {
$smarty->assign('termsandconditions', get_site_page_content('termsandconditions'));
}
$smarty->assign('PAGEHEADING', hsc(get_string('register')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('register.tpl');
?>
......@@ -211,7 +211,7 @@ foreach (array('alpha', 'freq') as $option) {
}
$smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('tags', $tags);
$smarty->assign('tagsortoptions', $tagsortoptions);
$smarty->assign('tag', $tag);
......
{auto_escape off}
{if $GROUP}
</div><!--end group-->
{/if}
......@@ -33,4 +32,3 @@
</div>
</body>
</html>
{/auto_escape}
{auto_escape off}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}>
{include file="header/head.tpl"}
<body>
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_url filename='images/icon_problem.gif'}" alt="">{$masqueradedetails} {$becomeyouagain}</div>{/if}
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_url filename='images/icon_problem.gif'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>{/if}
{if $SITECLOSED}<div class="sitemessage center">{$SITECLOSED}</div>{/if}
<div id="container">
<div id="loading-box"></div>
<div id="top-wrapper"><h1 id="site-logo"><a href="{$WWWROOT}"><img src="{theme_url filename='images/site-logo.png'}" alt="{$sitename|escape}"></a></h1>
<div id="top-wrapper"><h1 id="site-logo"><a href="{$WWWROOT}"><img src="{theme_url filename='images/site-logo.png'}" alt="{$sitename}"></a></h1>
{include file="header/topright.tpl"}
{include file="header/navigation.tpl"}
<div class="cb"></div>
......@@ -24,13 +23,12 @@
{dynamic}{insert_messages}{/dynamic}
<div id="main-column-container">
{if isset($PAGEHEADING)} <h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON}</span>{/if}</h1>
{if isset($PAGEHEADING)} <h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h1>
{/if}
{if $SUBPAGENAV}{* Tabs and beginning of page container for group info pages *} <ul class="in-page-tabs">
{foreach from=$SUBPAGENAV item=item}
<li><a {if $item.selected}class="current-tab" {/if}href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>
<li><a {if $item.selected}class="current-tab" {/if}href="{$WWWROOT}{$item.url}">{$item.title}</a></li>
{/foreach}
</ul>
<div class="subpage rel">
{/if}
{/auto_escape}
{auto_escape off}
<head>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<title>{$PAGETITLE|escape}</title>
<title>{$PAGETITLE}</title>
<script type="text/javascript">
var config = {literal}{{/literal}
'theme': {$THEMELIST},
'theme': {$THEMELIST|safe},
'sesskey' : '{$SESSKEY}',
'wwwroot': '{$WWWROOT}',
'loggedin': {$USER->is_logged_in()|intval},
'userid': {$USER->get('id')}
{literal}}{/literal};
</script>
{$STRINGJS}
{$STRINGJS|safe}
{foreach from=$JAVASCRIPT item=script}
<script type="text/javascript" src="{$script}"></script>
{/foreach}
{foreach from=$HEADERS item=header}
{$header}
{$header|safe}
{/foreach}
{if isset($INLINEJAVASCRIPT)}
<script type="text/javascript">
{$INLINEJAVASCRIPT}
{$INLINEJAVASCRIPT|safe}
</script>
{/if}
<!--[if lt IE 7.]>
......@@ -34,4 +33,3 @@
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico" type="image/vnd.microsoft.icon">
</head>
{dynamic}{flush}{/dynamic}
{/auto_escape}