Commit 20486a5a authored by nicolasconnault's avatar nicolasconnault
Browse files

MDL-19787 Converted print_box* to $OUTPUT->box*

parent 229e1258
......@@ -56,7 +56,7 @@
notify('This block still uses an old-style config_global.html file. ' .
'It must be updated by a developer to use a settings.php file.');
print_box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
echo '<br />';
echo '<form method="post" action="block.php">';
......@@ -66,9 +66,9 @@
}
echo '</p>';
print_box_start();
echo $OUTPUT->box_start();
include($CFG->dirroot.'/blocks/'. $block->name() .'/config_global.html');
print_box_end();
echo $OUTPUT->box_end();
echo '</form>';
echo $OUTPUT->footer();
......
......@@ -138,7 +138,7 @@
$a = new stdClass;
$a->filter = $filtername;
$a->directory = $filterpath;
print_box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
echo $OUTPUT->box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
print_continue($returnurl);
echo $OUTPUT->footer();
exit;
......
......@@ -125,7 +125,7 @@ if (!core_tables_exist()) {
echo $OUTPUT->heading(get_string('copyrightnotice'));
$copyrightnotice = text_to_html(get_string('gpl'));
$copyrightnotice = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $copyrightnotice); // extremely ugly validation hack
print_box($copyrightnotice, 'copyrightnotice');
echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
echo '<br />';
notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1&lang=$CFG->lang",
"http://docs.moodle.org/en/License");
......@@ -139,7 +139,7 @@ if (!core_tables_exist()) {
echo $OUTPUT->heading("Moodle $release");
$releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
$releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
print_box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide');
echo $OUTPUT->box($releasenoteslink, 'generalbox boxaligncenter boxwidthwide');
require_once($CFG->libdir.'/environmentlib.php');
if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
......@@ -203,7 +203,7 @@ if ($version > $CFG->version) { // upgrade
echo $OUTPUT->heading("Moodle $release");
$releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
$releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
print_box($releasenoteslink);
echo $OUTPUT->box($releasenoteslink);
require_once($CFG->libdir.'/environmentlib.php');
if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
......@@ -211,9 +211,9 @@ if ($version > $CFG->version) { // upgrade
} else {
notify(get_string('environmentok', 'admin'), 'notifysuccess');
if (empty($CFG->skiplangupgrade)) {
print_box_start('generalbox', 'notice');
echo $OUTPUT->box_start('generalbox', 'notice');
print_string('langpackwillbeupdated', 'admin');
print_box_end();
echo $OUTPUT->box_end();
}
print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
}
......@@ -226,9 +226,9 @@ if ($version > $CFG->version) { // upgrade
$navigation = build_navigation(array(array('name'=>$strplugincheck, 'link'=>null, 'type'=>'misc')));
print_header($strplugincheck, $strplugincheck, $navigation, '', '', false, '&nbsp;', '&nbsp;');
echo $OUTPUT->heading($strplugincheck);
print_box_start('generalbox', 'notice');
echo $OUTPUT->box_start('generalbox', 'notice');
print_string('pluginchecknotice');
print_box_end();
echo $OUTPUT->box_end();
print_plugin_tables();
print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
......@@ -342,14 +342,14 @@ admin_externalpage_setup('adminnotifications');
admin_externalpage_print_header();
if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
} else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
print_box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
echo $OUTPUT->box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
}
if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
echo $OUTPUT->box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
}
// If no recently cron run
......@@ -357,17 +357,17 @@ $lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
if (time() - $lastcron > 3600 * 24) {
$strinstallation = get_string('installation', 'install');
$helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
print_box(get_string('cronwarning', 'admin').'&nbsp;'.$helpbutton, 'generalbox adminwarning');
echo $OUTPUT->box(get_string('cronwarning', 'admin').'&nbsp;'.$helpbutton, 'generalbox adminwarning');
}
// Print multilang upgrade notice if needed
if (empty($CFG->filter_multilang_converted)) {
print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
echo $OUTPUT->box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
}
// Alert if we are currently in maintenance mode
if (!empty($CFG->maintenance_enabled)) {
print_box(get_string('sitemaintenancewarning2', 'admin', "$CFG->wwwroot/$CFG->admin/settings.php?section=maintenancemode"), 'generalbox adminwarning');
echo $OUTPUT->box(get_string('sitemaintenancewarning2', 'admin', "$CFG->wwwroot/$CFG->admin/settings.php?section=maintenancemode"), 'generalbox adminwarning');
}
......@@ -378,7 +378,7 @@ $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
'<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
print_box($copyrighttext, 'copyright');
echo $OUTPUT->box($copyrighttext, 'copyright');
//////////////////////////////////////////////////////////////////////////////////////////////////
echo $OUTPUT->footer();
......
......@@ -137,14 +137,14 @@
if (!$mode) {
// TODO this is a very nice place to put some translation statistics
print_box_start();
echo $OUTPUT->box_start();
$currlang = current_language();
$langs = get_list_of_languages(false, true);
$select = moodle_select::make_popup_form("$CFG->wwwroot/$CFG->admin/lang.php", 'lang', $langs, "chooselang", $currlang);
$select->nothinglabel = false;
$select->set_label($strcurrentlanguage.':');
echo $OUTPUT->select($select);
print_box_end();
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
exit;
}
......@@ -195,7 +195,7 @@
// Total number of strings and missing strings
$totalcounter->strings = 0;
$totalcounter->missing = 0;
$totalcounter->missing = 0;
// For each file, check that a counterpart exists, then check all the strings
foreach ($stringfiles as $stringfile) {
......@@ -204,7 +204,7 @@
$prefix = $stringfile['prefix'];
$filename = $stringfile['filename'];
unset($string);
// Get some information about file locations:
// $enfilepath = the path to the English file distributed either in the core space or in plugin space
// $trfilepath = the path to the translated file distributed either in the lang pack or in plugin space
......@@ -232,7 +232,7 @@
$enstring = isset($string) ? $string : array();
unset($string);
ksort($enstring);
//$lcstring = local customizations
$lcstring = array();
if (file_exists($lcfilepath)) {
......@@ -332,7 +332,7 @@
}
if ($m <> '') {
print_box($m, 'filenames');
echo $OUTPUT->box($m, 'filenames');
}
echo $o;
......@@ -466,7 +466,7 @@
}
$saveinto = $locallangdir;
}
if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
notify(get_string("changessaved")." ($saveinto/$currentfile)", "notifysuccess");
} else {
......@@ -475,7 +475,7 @@
unset($packstring);
}
print_box_start('generalbox editstrings');
echo $OUTPUT->box_start('generalbox editstrings');
$menufiles = array();
$menufiles_coregrp = 1;
foreach ($stringfiles as $stringfile) {
......@@ -499,8 +499,8 @@
$select->set_label($selectionlabel);
echo $OUTPUT->select($select);
helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
print_box_end();
echo $OUTPUT->box_end();
if ($currentfile <> '') {
error_reporting(0);
if (!isset($editable) || $editable) {
......@@ -525,7 +525,7 @@
error_reporting($CFG->debug);
$o = ''; // stores the HTML output to be echo-ed
unset($string);
include($enfilepath);
$enstring = isset($string) ? $string : array();
......@@ -729,7 +729,7 @@
}
}
print_box_start('generalbox editstrings');
echo $OUTPUT->box_start('generalbox editstrings');
$menufiles = array();
$menufiles_coregrp = 1;
$origlocation = ''; // the location of the currentfile's English source will be stored here
......@@ -766,7 +766,7 @@
$select->set_label($selectionlabel);
echo $OUTPUT->select($select);
helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
print_box_end();
echo $OUTPUT->box_end();
if (!empty($currentfile)) {
......
......@@ -13,7 +13,7 @@
if (!empty($CFG->skiplangupgrade)) {
admin_externalpage_print_header();
print_box(get_string('langimportdisabled', 'admin'));
echo $OUTPUT->box(get_string('langimportdisabled', 'admin'));
echo $OUTPUT->footer();
die;
}
......@@ -275,9 +275,9 @@
}
if (!$remote) {
print_box_start();
echo $OUTPUT->box_start();
print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
print_box_end();
echo $OUTPUT->box_end();
}
if ($notice_ok) {
......@@ -310,7 +310,7 @@
}
}
print_box_start();
echo $OUTPUT->box_start();
echo '<table summary="">';
echo '<tr><td align="center" valign="top">';
echo '<form id="uninstallform" action="langimport.php?mode='.DELETION_OF_SELECTED_LANG.'" method="post">';
......@@ -389,7 +389,7 @@
//close available langs table
echo '</td></tr></table>';
print_box_end();
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
......
......@@ -36,7 +36,7 @@ if (array_key_exists($CFG->mnet_localhost_id, $mnethosts)) {
// process actions
if (!empty($action) and confirm_sesskey()) {
// boot if insufficient permission
if (!has_capability('moodle/user:delete', $sitecontext)) {
print_error('nomodifyacl','mnet');
......@@ -56,7 +56,7 @@ if (!empty($action) and confirm_sesskey()) {
break;
case "acl":
// require the access parameter, and it must be 'allow' or 'deny'
$accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
if ($accessctrl != 'allow' and $accessctrl != 'deny') {
......@@ -119,7 +119,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
}
// Explain
print_box(get_string('ssoacldescr','mnet'));
echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
// Are the needed bits enabled?
$warn = '';
if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
......@@ -135,7 +135,7 @@ if (get_config('auth/mnet', 'auto_add_remote_users') != true) {
}
if (!empty($warn)) {
$warn = '<p>' . get_string('ssoaclneeds','mnet').'</p>' . $warn;
print_box($warn);
echo $OUTPUT->box($warn);
}
// output the ACL table
$columns = array("username", "mnet_host_id", "access", "delete");
......@@ -196,7 +196,7 @@ if (!empty($table)) {
print_simple_box_start('center','90%','','20');
?>
<div class="mnetaddtoaclform">
<div class="mnetaddtoaclform">
<form id="mnetaddtoacl" method="post">
<input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>" />
<?php
......
......@@ -99,14 +99,14 @@
}
}
}
$all_enrolled_usernames = '';
$timemodified = array();
/// List all the users (homed on this server) who are enrolled on the course
/// This will include mnet-enrolled users, and those who have enrolled
/// This will include mnet-enrolled users, and those who have enrolled
/// themselves, etc.
if (is_array($all_enrolled_users) && count($all_enrolled_users)) {
list($select, $params) = $DB->get_in_or_equal(array_keys($all_enrolled_users), SQL_PARAMS_NAMED, 'un0');
list($select, $params) = $DB->get_in_or_equal(array_keys($all_enrolled_users), SQL_PARAMS_NAMED, 'un0');
$select = " u.username $select AND ";
} else {
......@@ -134,7 +134,7 @@
ON
a.userid = u.id AND a.courseid=:courseid
WHERE
$select
$select
u.deleted = 0 AND
u.confirmed = 1 AND
u.mnethostid = :mnetid
......@@ -172,7 +172,7 @@
// Read about our remote enrolments in 2 sets
// first, get the remote enrolments done via enrol/mnet $mnetenrolledusers
// second, get the remote enrolments done with other plugins $remtenrolledusers
// NOTE: both arrays are keyed on the userid!
// NOTE: both arrays are keyed on the userid!
$sql = "
SELECT
u.id,
......@@ -185,7 +185,7 @@
{user} u,
{mnet_enrol_assignments} a
WHERE
a.userid = u.id AND
a.userid = u.id AND
a.courseid=:courseid AND
a.enroltype = 'mnet' AND
u.deleted = 0 AND
......@@ -213,7 +213,7 @@
{user} u,
{mnet_enrol_assignments} a
WHERE
a.userid = u.id AND
a.userid = u.id AND
a.courseid=:courseid AND
a.enroltype != 'mnet' AND
u.deleted = 0 AND
......@@ -249,9 +249,9 @@
$params['search2'] = "%$searchtext%";
}
$sql = ("SELECT id, firstname, lastname, email
$sql = ("SELECT id, firstname, lastname, email
FROM {user} u
WHERE deleted = 0 AND confirmed = 1
WHERE deleted = 0 AND confirmed = 1
AND mnethostid = :mnetid
$select
ORDER BY lastname ASC, firstname ASC");
......@@ -259,9 +259,9 @@
$availableusers = $DB->get_recordset_sql($sql, $params, 0, MAX_USERS_PER_PAGE);
$sql = ("SELECT COUNT('x')
$sql = ("SELECT COUNT('x')
FROM {user} u
WHERE deleted = 0 AND confirmed = 1
WHERE deleted = 0 AND confirmed = 1
AND mnethostid = :mnetid
$select");
$availablecount = $DB->count_records_sql($sql, $params);
......@@ -286,8 +286,8 @@ $strsearchresults = get_string('searchresults');
admin_externalpage_print_header();
print_box('<strong>' . s($mnet_peer->name) . ' : '
. format_string($course->shortname) .' '. format_string($course->fullname)
echo $OUTPUT->box('<strong>' . s($mnet_peer->name) . ' : '
. format_string($course->shortname) .' '. format_string($course->fullname)
. '</strong><br />'
. get_string("enrolcourseenrol_desc", "mnet"));
......
......@@ -24,7 +24,7 @@
admin_externalpage_print_header();
print_box('<strong>' . s($host->name) . ' </strong><br />'
echo $OUTPUT->box('<strong>' . s($host->name) . ' </strong><br />'
. get_string("enrolcourses_desc", "mnet"));
echo '<hr />';
......
......@@ -17,12 +17,12 @@
admin_externalpage_print_header();
print_box(get_string("remoteenrolhosts_desc", "mnet"));
echo $OUTPUT->box(get_string("remoteenrolhosts_desc", "mnet"));
echo '<hr />';
if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
print_box(get_string('mnetdisabled','mnet'));
echo $OUTPUT->box(get_string('mnetdisabled','mnet'));
}
echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
......
......@@ -2,7 +2,7 @@
admin_externalpage_print_header();
if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
print_box(get_string('mnetdisabled','mnet'));
echo $OUTPUT->box(get_string('mnetdisabled','mnet'));
}
?>
<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
......@@ -67,7 +67,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
</table>
<form method="post" action="peers.php">
<table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
<tr>
<th class="header c4" colspan="4">
<?php print_string('addnewhost', 'mnet'); ?>
......@@ -92,7 +92,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
<tr>
<td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
</tr>
</table>
</form>
</div>
......
......@@ -148,7 +148,7 @@
$a->qtype = $qtypename;
$a->directory = $QTYPES[$delete]->plugin_dir();
print_box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
echo $OUTPUT->box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
print_continue(admin_url('qtypes.php'));
echo $OUTPUT->footer();
exit;
......
......@@ -69,7 +69,7 @@ if (count($cleanedroleids) == count($allroles)) {
}
// Print the settings form.
print_box_start('generalbox boxwidthwide boxaligncenter centerpara');
echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter centerpara');
echo '<form method="get" action="." id="settingsform">';
echo $OUTPUT->heading(get_string('reportsettings', 'report_capability'));
echo '<p id="intro">', get_string('intro', 'report_capability') , '</p>';
......@@ -79,7 +79,7 @@ echo '<p><label for="menuroles"> ' . get_string('roleslabel', 'report_capability
choose_from_menu($rolechoices, 'roles[]', $selectedroleids, '', '', '', false, false, 0, '', true, true);
echo '<p><input type="submit" id="settingssubmit" value="' . get_string('getreport', 'report_capability') . '" /></p>';
echo '</form>';
print_box_end();
echo $OUTPUT->box_end();
// If we have a capability, generate the report.
if ($capability) {
......@@ -191,7 +191,7 @@ function print_report_tree($contextid, $contexts, $allroles) {
foreach ($allroles as $role) {
if (isset($contexts[$contextid]->rolecapabilites[$role->id])) {
$permission = $contexts[$contextid]->rolecapabilites[$role->id];
echo '<tr class="r' . ($rowcounter % 2) . '"><th class="cell">', $role->name,
echo '<tr class="r' . ($rowcounter % 2) . '"><th class="cell">', $role->name,
'</th><td class="cell">' . $strpermissions[$permission] . '</td></tr>';
$rowcounter++;
}
......
<?php // $Id$
/**
* For a given question type, list the number of
* For a given question type, list the number of
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package roles
......@@ -28,7 +28,7 @@ foreach ($QTYPES as $qtype) {
}
// Print the settings form.
print_box_start('generalbox boxwidthwide boxaligncenter centerpara');
echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter centerpara');
echo '<form method="get" action="." id="settingsform"><div>';
echo $OUTPUT->heading(get_string('reportsettings', 'report_questioninstances'));
echo '<p id="intro">', get_string('intro', 'report_questioninstances') , '</p>';
......@@ -38,7 +38,7 @@ echo '</p>';
echo '<p><input type="submit" id="settingssubmit" value="' .
get_string('getreport', 'report_questioninstances') . '" /></p>';
echo '</div></form>';
print_box_end();
echo $OUTPUT->box_end();
// If we have a qtype to report on, generate the report.
if ($requestedqtype) {
......@@ -64,7 +64,7 @@ if ($requestedqtype) {
// Get the question counts, and all the context information, for each
// context. That is, rows of these results can be used as $context objects.
$counts = $DB->get_records_sql("
SELECT qc.contextid, count(1) as numquestions, sum(hidden) as numhidden, con.id, con.contextlevel, con.instanceid, con.path, con.depth
SELECT qc.contextid, count(1) as numquestions, sum(hidden) as numhidden, con.id, con.contextlevel, con.instanceid, con.path, con.depth
FROM {question} q
JOIN {question_categories} qc ON q.category = qc.id
JOIN {context} con ON con.id = qc.contextid
......
......@@ -94,7 +94,7 @@ if ($issue and ($result = $issue(true))) {
print_table($table);
print_box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
echo $OUTPUT->box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
print_continue($url);
......
......@@ -45,7 +45,7 @@ admin_externalpage_setup('reportspamcleaner');
$PAGE->requires->yui_lib('json');
$PAGE->requires->yui_lib('connection');
// Implement some AJAX calls
// Implement some AJAX calls
// Delete one user
if (!empty($del) && confirm_sesskey() && ($id != $USER->id)) {
......@@ -91,9 +91,9 @@ admin_externalpage_print_header();
print_spamcleaner_javascript();
print_box(get_string('spamcleanerintro', 'report_spamcleaner'));
echo $OUTPUT->box(get_string('spamcleanerintro', 'report_spamcleaner'));
print_box_start(); // The forms section at the top
echo $OUTPUT->box_start(); // The forms section at the top
?>
......@@ -101,7 +101,7 @@ print_box_start(); // The forms section at the top
<form method="post" action="index.php">
<div>
<input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" />
<input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" />
<input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
<input type="submit" value="<?php echo get_string('spamsearch', 'report_spamcleaner')?>" />
</div>
......@@ -120,7 +120,7 @@ print_box_start(); // The forms section at the top
</div>
<?php
print_box_end();
echo $OUTPUT->box_end();
echo '<div id="result" class="mdl-align">';
......@@ -142,12 +142,12 @@ echo '</div>';
/////////////////////////////////////////////////////////////////////////////////
/// Functions
/// Functions
function search_spammers($keywords) {
global $CFG, $USER, $DB;
global $CFG, $USER, $DB, $OUTPUT;
if (!is_array($keywords)) {
$keywords = array($keywords); // Make it into an array
......@@ -170,7 +170,7 @@ function search_spammers($keywords) {
$spamusers_blog = $DB->get_recordset_sql($sql2);
$keywordlist = implode(', ', $keywords);
print_box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
echo $OUTPUT->box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
print_user_list(array($spamusers_desc, $spamusers_blog), $keywords);
......
......@@ -82,9 +82,9 @@ class ExHtmlReporter extends HtmlReporter {
* Private method. Used by printPass/Fail/Error.
*/
function _paintPassFail($passorfail, $message, $rawmessage=false) {
global $FULLME, $CFG;
global $FULLME, $CFG, $OUTPUT;
print_box_start($passorfail . ' generalbox ');
echo $OUTPUT->box_start($passorfail . ' generalbox ');
$url = $this->_htmlEntities($this->_stripParameterFromUrl($FULLME, 'path'));
echo '<b class="', $passorfail, '">', $this->get_string($passorfail), '</b>: ';
$breadcrumb = $this->getTestList();
......@@ -100,7 +100,7 @@ class ExHtmlReporter extends HtmlReporter {
echo "<a href=\"{$url}path=$folder$file\" title=\"$this->strrunonlyfile\">$file</a>";
echo $this->strseparator, implode($this->strseparator, $breadcrumb);
echo '<br />', ($rawmessage ? $message : $this->_htmlEntities($message)), "\n\n";
print_box_end();
echo $OUTPUT->box_end();
flush();
}
......@@ -226,4 +226,4 @@ class ExHtmlReporter extends HtmlReporter {
return get_string($identifier, 'simpletest', $a);
}
}
?>
\ No newline at end of file
?>