Permalink
Browse files

MDL-22414 Merge branch 'master' into backup-convert

Conflicts:
	theme/base/style/core.css
  • Loading branch information...
2 parents fad0f24 + 6911fa1 commit b61cf3ff8a3467a9245325f5157c1b20e090c116 @mudrd8mz mudrd8mz committed Jun 9, 2011
Showing 577 changed files with 73,215 additions and 25,052 deletions.
View
@@ -622,7 +622,7 @@ public function generate_questions($courses, $modules) {
require_once($CFG->libdir .'/questionlib.php');
require_once($CFG->dirroot .'/mod/quiz/editlib.php');
$questions = array();
- $questionsmenu = question_type_menu();
+ $questionsmenu = question_bank::get_creatable_qtypes();
$questiontypes = array();
foreach ($questionsmenu as $qtype => $qname) {
$questiontypes[] = $qtype;
View
@@ -355,7 +355,6 @@
}
// login user and let him set password and admin details
$adminuser->newadminuser = 1;
- message_set_default_message_preferences($adminuser);
complete_user_login($adminuser, false);
redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
View
@@ -0,0 +1,70 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Message outputs configuration page
+ *
+ * @package message
+ * @copyright 2011 Lancaster University Network Services Limited
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+require_once(dirname(__FILE__) . '/../config.php');
+require_once($CFG->dirroot . '/message/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+// This is an admin page
+admin_externalpage_setup('managemessageoutputs');
+
+// Require site configuration capability
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+// Get the submitted params
+$disable = optional_param('disable', 0, PARAM_INT);
+$enable = optional_param('enable', 0, PARAM_INT);
+
+if (!empty($disable) && confirm_sesskey()) {
+ if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
+ print_error('outputdoesnotexist', 'message');
+ }
+ $DB->set_field('message_processors', 'enabled', '0', array('id'=>$processor->id)); // Disable output
+}
+
+if (!empty($enable) && confirm_sesskey() ) {
+ if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
+ print_error('outputdoesnotexist', 'message');
+ }
+ $DB->set_field('message_processors', 'enabled', '1', array('id'=>$processor->id)); // Enable output
+}
+
+if ($disable || $enable) {
+ $url = new moodle_url('message.php');
+ redirect($url);
+}
+// Page settings
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+
+// Grab the renderer
+$renderer = $PAGE->get_renderer('core', 'message');
+
+// Display the manage message outputs interface
+$processors = get_message_processors();
+$messageoutputs = $renderer->manage_messageoutputs($processors);
+
+// Display the page
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('managemessageoutputs', 'message'));
+echo $messageoutputs;
+echo $OUTPUT->footer();
Oops, something went wrong.

0 comments on commit b61cf3f

Please sign in to comment.