"MDL-13766, fixed theme coding error"

This commit is contained in:
Dongsheng Cai 2010-03-04 06:44:16 +00:00
parent 57173b8dfb
commit 3b8e973833

View file

@ -24,13 +24,14 @@ if ($edit) {
$pagename = 'repositorynew'; $pagename = 'repositorynew';
} }
admin_externalpage_setup($pagename);
require_login(SITEID, false); require_login(SITEID, false);
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
admin_externalpage_setup($pagename);
$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repository.php?sesskey=" . sesskey(); $sesskeyurl = "$CFG->wwwroot/$CFG->admin/repository.php?sesskey=" . sesskey();
$baseurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managerepositories"; $baseurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managerepositories";
$configstr = get_string('managerepositories', 'repository'); $configstr = get_string('managerepositories', 'repository');
$return = true; $return = true;
@ -100,8 +101,6 @@ if (!empty($edit) || !empty($new)) {
} }
if ($success) { if ($success) {
$savedstr = get_string('configsaved', 'repository'); $savedstr = get_string('configsaved', 'repository');
admin_externalpage_print_header();
echo $OUTPUT->heading($savedstr);
redirect($baseurl, $savedstr, 3); redirect($baseurl, $savedstr, 3);
} else { } else {
print_error('instancenotsaved', 'repository', $baseurl); print_error('instancenotsaved', 'repository', $baseurl);
@ -145,24 +144,25 @@ if (!empty($edit) || !empty($new)) {
$repositorytype->switch_and_update_visibility(); $repositorytype->switch_and_update_visibility();
$return = true; $return = true;
} else if (!empty($delete)) { } else if (!empty($delete)) {
admin_externalpage_print_header();
$repositorytype = repository::get_type_by_typename($delete); $repositorytype = repository::get_type_by_typename($delete);
if ($sure) { if ($sure) {
$PAGE->set_pagetype('admin-repository-' . $delete);
if (!confirm_sesskey()) { if (!confirm_sesskey()) {
print_error('confirmsesskeybad', '', $baseurl); print_error('confirmsesskeybad', '', $baseurl);
} }
if ($repositorytype->delete()) { if ($repositorytype->delete()) {
$deletedstr = get_string('removed', 'repository'); $deletedstr = get_string('removed', 'repository');
echo $OUTPUT->heading($deletedstr);
redirect($baseurl, $deletedstr, 3); redirect($baseurl, $deletedstr, 3);
} else { } else {
print_error('instancenotdeleted', 'repository', $baseurl); print_error('instancenotdeleted', 'repository', $baseurl);
} }
exit; exit;
} } else {
admin_externalpage_print_header();
echo $OUTPUT->confirm(get_string('confirmremove', 'repository', $repositorytype->get_readablename()), $sesskeyurl . '&delete=' . $delete . '&sure=yes', $baseurl); echo $OUTPUT->confirm(get_string('confirmremove', 'repository', $repositorytype->get_readablename()), $sesskeyurl . '&delete=' . $delete . '&sure=yes', $baseurl);
$return = false; $return = false;
} }
}
else if (!empty($move) && !empty($type)) { else if (!empty($move) && !empty($type)) {
$repositorytype = repository::get_type_by_typename($type); $repositorytype = repository::get_type_by_typename($type);
$repositorytype->move_order($move); $repositorytype->move_order($move);