From: nicolasconnault <nicolasconnault>
Date: Tue, 18 Aug 2009 04:28:40 +0000 (+0000)
Subject: MDL-19878 Upgraded calls to helpbutton, print_simple_box* and notify
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8fbce1c8c88847d1096561a2916e77f884397a58;p=moodle.git

MDL-19878 Upgraded calls to helpbutton, print_simple_box* and notify
---

diff --git a/admin/auth_config.php b/admin/auth_config.php
index 4b1d9dea57..648757b763 100644
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -64,14 +64,14 @@ echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
 
 // auth plugin description
-print_simple_box_start('center', '80%');
+echo $OUTPUT->box_start();
 echo $OUTPUT->heading($authtitle);
-print_simple_box_start('center', '80%', '', 5, 'informationbox');
+echo $OUTPUT->box_start('informationbox');
 echo $authdescription;
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo "<hr />\n";
 $authplugin->config_form($frm, $err, $user_fields);
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
 echo "</div>\n";
 echo "</form>\n";
diff --git a/admin/block.php b/admin/block.php
index ffa08079a7..6c5252dfd5 100644
--- a/admin/block.php
+++ b/admin/block.php
@@ -53,7 +53,7 @@
 
     echo $OUTPUT->heading($strblockname);
 
-    notify('This block still uses an old-style config_global.html file. ' .
+    echo $OUTPUT->notification('This block still uses an old-style config_global.html file. ' .
             'It must be updated by a developer to use a settings.php file.');
 
     echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
diff --git a/admin/blocks.php b/admin/blocks.php
index 396c703402..3815328a97 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -80,7 +80,7 @@
 
             // Delete block
             if (!$DB->delete_records('block', array('id'=>$block->id))) {
-                notify("Error occurred while deleting the $strblockname record from blocks table");
+                echo $OUTPUT->notification("Error occurred while deleting the $strblockname record from blocks table");
             }
 
             drop_plugin_tables($block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false); // old obsoleted table names
diff --git a/admin/dbtransfer/index.php b/admin/dbtransfer/index.php
index 5fafd7e57d..21221d8435 100644
--- a/admin/dbtransfer/index.php
+++ b/admin/dbtransfer/index.php
@@ -33,8 +33,8 @@ if ($data = $form->get_data()) {
     $feedback->finished();
 
     // Finish up.
-    notify(get_string('success'), 'notifysuccess');
-    print_continue("$CFG->wwwroot/$CFG->admin/");
+    echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
+    echo $OUTPUT->continue_button("$CFG->wwwroot/$CFG->admin/");
     echo $OUTPUT->footer();
     die;
 }
diff --git a/admin/delete.php b/admin/delete.php
index e2072fbae4..7855e75939 100644
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -45,7 +45,7 @@
     delete_subdirectories($deletedir);
 
     echo '<h1 align="center">Done!</h1>';
-    print_continue($CFG->wwwroot);
+    echo $OUTPUT->continue_button($CFG->wwwroot);
     echo $OUTPUT->footer();
     exit;
 
diff --git a/admin/enrol.php b/admin/enrol.php
index 3c20d6c361..598b0cb7e0 100644
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -58,7 +58,7 @@
     }
     asort($options);
 
-    print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
+    echo $OUTPUT->box(get_string('configenrolmentplugins', 'admin'));
 
     echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
     echo "<div>";
diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 2fea1aeb3a..b3a9e4ee9b 100644
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -48,19 +48,19 @@
     echo "<input type=\"hidden\" name=\"enrol\" value=\"".$enrol."\" />";
 
 /// Print current enrolment type description
-    print_simple_box_start("center", "80%");
+    echo $OUTPUT->box_start();
     echo $OUTPUT->heading($options[$enrol]);
 
-    print_simple_box_start("center", "60%", '', 5, 'informationbox');
+    echo $OUTPUT->box_start('informationbox');
     print_string("description", "enrol_$enrol");
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
 
     echo "<hr />";
 
     $enrolment->config_form($frm);
 
     echo "<p class=\"centerpara\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p>\n";
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
     echo "</div>";
     echo "</form>";
 
diff --git a/admin/environment.php b/admin/environment.php
index d1b84f1854..ee89bde7c0 100644
--- a/admin/environment.php
+++ b/admin/environment.php
@@ -72,23 +72,23 @@
                         $a = new stdClass();
                         $a->url = 'http://download.moodle.org/environment/environment.zip';
                         $a->dest= $CFG->dataroot.'/';
-                        print_simple_box(get_string($cd->get_error(), 'error', $a), 'center', '', '', 5, 'errorbox');
+                        echo $OUTPUT->box(get_string($cd->get_error(), 'error', $a), 'errorbox');
                     } else {
-                        print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
+                        echo $OUTPUT->box(get_string($cd->get_error(), 'error'), 'errorbox');
                     }
                     break;
                 case COMPONENT_UPTODATE:
-                    print_simple_box(get_string($cd->get_error(), 'error'), 'center');
+                    echo $OUTPUT->box(get_string($cd->get_error(), 'error'));
                     break;
                 case COMPONENT_INSTALLED:
-                    print_simple_box(get_string('componentinstalled', 'admin'), 'center');
+                    echo $OUTPUT->box(get_string('componentinstalled', 'admin'));
                     break;
             }
         }
     }
 
 /// Start of main box
-    print_simple_box_start('center');
+    echo $OUTPUT->box_start();
 
     echo "<div style=\"text-align:center\">".$stradminhelpenvironment."</div><br />";
 
@@ -127,7 +127,7 @@
     echo '</div>';
 
 /// End of main box
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
 
 /// Gather and show results
     $status = check_moodle_environment($version, $environment_results);
diff --git a/admin/filters.php b/admin/filters.php
index d71b2f4736..daafb9cca3 100644
--- a/admin/filters.php
+++ b/admin/filters.php
@@ -139,7 +139,7 @@
         $a->filter = $filtername;
         $a->directory = $filterpath;
         echo $OUTPUT->box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
-        print_continue($returnurl);
+        echo $OUTPUT->continue_button($returnurl);
         echo $OUTPUT->footer();
         exit;
     }
diff --git a/admin/generator.php b/admin/generator.php
index f523ea1cc6..d093c82acd 100755
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -1208,7 +1208,7 @@ class generator_web extends generator {
         $systemcontext = get_context_instance(CONTEXT_SYSTEM);
         if (!has_capability('moodle/site:doanything', $systemcontext)) {
             // If not logged in, give link to login page for current site
-            notify("You must be logged in as administrator before using this script.");
+            echo $OUTPUT->notification("You must be logged in as administrator before using this script.");
             echo $OUTPUT->footer();
             require_login();
         } else {
diff --git a/admin/index.php b/admin/index.php
index ec4617a9c3..5287a39abe 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -145,8 +145,8 @@ if (!core_tables_exist()) {
         if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
             print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
         } else {
-            notify(get_string('environmentok', 'admin'), 'notifysuccess');
-            print_continue("index.php?agreelicense=1&amp;confirmrelease=1&amp;lang=$CFG->lang");
+            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
+            echo $OUTPUT->continue_button("index.php?agreelicense=1&confirmrelease=1&lang=$CFG->lang");
         }
 
         echo $OUTPUT->footer();
@@ -209,13 +209,13 @@ if ($version > $CFG->version) {  // upgrade
         if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
             print_upgrade_reload('index.php?confirmupgrade=1');
         } else {
-            notify(get_string('environmentok', 'admin'), 'notifysuccess');
+            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
             if (empty($CFG->skiplangupgrade)) {
                 echo $OUTPUT->box_start('generalbox', 'notice');
                 print_string('langpackwillbeupdated', 'admin');
                 echo $OUTPUT->box_end();
             }
-            print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
+            echo $OUTPUT->continue_button('index.php?confirmupgrade=1&confirmrelease=1');
         }
 
         echo $OUTPUT->footer();
@@ -231,7 +231,7 @@ if ($version > $CFG->version) {  // upgrade
         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');
+        echo $OUTPUT->continue_button('index.php?confirmupgrade=1&confirmrelease=1&confirmplugincheck=1');
         echo $OUTPUT->footer();
         die();
 
@@ -240,7 +240,7 @@ if ($version > $CFG->version) {  // upgrade
         upgrade_core($version, true);
     }
 } else if ($version < $CFG->version) {
-    notify('WARNING!!!  The code you are using is OLDER than the version that made these databases!');
+    echo $OUTPUT->notification('WARNING!!!  The code you are using is OLDER than the version that made these databases!');
 }
 
 // Updated human-readable release version if necessary
@@ -356,7 +356,7 @@ if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
 $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);
+    $helpbutton = $OUTPUT->help_icon(moodle_help_icon::make('install', $strinstallation));
     echo $OUTPUT->box(get_string('cronwarning', 'admin').'&nbsp;'.$helpbutton, 'generalbox adminwarning');
 }
 
diff --git a/admin/innodb.php b/admin/innodb.php
index f9de6b9b0e..cee3236935 100644
--- a/admin/innodb.php
+++ b/admin/innodb.php
@@ -20,7 +20,7 @@
 
     if (data_submitted() and $confirm and confirm_sesskey()) {
 
-        notify('Please be patient and wait for this to complete...', 'notifysuccess');
+        echo $OUTPUT->notification('Please be patient and wait for this to complete...', 'notifysuccess');
 
         if ($tables = $DB->get_tables()) {
             $DB->set_debug(true);
@@ -30,8 +30,8 @@
             }
             $DB->set_debug(false);
         }
-        notify('... done.', 'notifysuccess');
-        print_continue('index.php');
+        echo $OUTPUT->notification('... done.', 'notifysuccess');
+        echo $OUTPUT->continue_button('index.php');
         echo $OUTPUT->footer();
 
     } else {
diff --git a/admin/lang.php b/admin/lang.php
index 15e7cea962..1bf52f880e 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -254,7 +254,7 @@
                 $fileismissing = 0;
             } else {
                 $fileismissing = 1;
-                $o .= notify(get_string("filemissing", "", $trfilepath), "notifyproblem", "center", true);
+                $o .= $OUTPUT->notification(get_string("filemissing", "", $trfilepath), "notifyproblem");
             }
 
             $missingcounter = 0;
@@ -343,7 +343,7 @@
 
         foreach ($files as $filekey => $file) {    // check all the help files.
             if (!file_exists("$langdir/help/$file")) {
-                notify(get_string("filemissing", "", "$langdir/help/$file"), 'notifyproblem');
+                echo $OUTPUT->notification(get_string("filemissing", "", "$langdir/help/$file"), 'notifyproblem');
                 $somethingfound = true;
                 continue;
             }
@@ -354,14 +354,14 @@
         }
         foreach ($files as $filekey => $file) {    // check all the docs files.
             if (!file_exists("$langdir/docs/$file")) {
-                notify(get_string("filemissing", "", "$langdir/docs/$file"), 'notifyproblem');
+                echo $OUTPUT->notification(get_string("filemissing", "", "$langdir/docs/$file"), 'notifyproblem');
                 $somethingfound = true;
                 continue;
             }
         }
 
         if (!empty($somethingfound)) {
-            print_continue("lang.php");
+            echo $OUTPUT->continue_button("lang.php");
         } else {
             notice(get_string("languagegood"), "lang.php" );
         }
@@ -410,7 +410,7 @@
                     print_error('filemismatch', 'error', '', (object)array('current'=>$currectfile, 'file'=>$prefix.$plugin.'.php'));
                 }
                 if (!$uselocal) {
-                    notify($streditingnoncorelangfile);
+                    echo $OUTPUT->notification($streditingnoncorelangfile);
                     $editable = false;
                 }
             } else {
@@ -468,7 +468,7 @@
             }
 
             if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
-                notify(get_string("changessaved")." ($saveinto/$currentfile)", "notifysuccess");
+                echo $OUTPUT->notification(get_string("changessaved")." ($saveinto/$currentfile)", "notifysuccess");
             } else {
                 print_error('cannotsavefile', 'error', 'lang.php?mode=compare&amp;currentfile=$currentfile', $saveinto.'/'.$currentfile);
             }
@@ -498,7 +498,7 @@
         $select->nothinglabel = $strchoosefiletoedit;
         $select->set_label($selectionlabel);
         echo $OUTPUT->select($select);
-        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
+        echo $OUTPUT->help_icon(moodle_help_icon::make('langswitchstorage', $strfilestoredinhelp));
         echo $OUTPUT->box_end();
 
         if ($currentfile <> '') {
@@ -519,7 +519,7 @@
                     fclose($f);
                 } else {
                     $editable = false;
-                    notify(get_string("makeeditable", "", "$saveto/$currentfile"), 'notifyproblem');
+                    echo $OUTPUT->notification(get_string("makeeditable", "", "$saveto/$currentfile"), 'notifyproblem');
                 }
             }
             error_reporting($CFG->debug);
@@ -723,7 +723,7 @@
                 print_error('confirmsesskeybad', 'error');
             }
             if (lang_help_save_file($saveto, $currentfile, $_POST['filedata'])) {
-                notify(get_string("changessaved")." ($saveto/$currentfile)", "notifysuccess");
+                echo $OUTPUT->notification(get_string("changessaved")." ($saveto/$currentfile)", "notifysuccess");
             } else {
                 print_error('cannotsavefile', 'error', 'lang.php?mode=compare&amp;currentfile=$currentfile', array($saveinto, $currentfile));
             }
@@ -765,7 +765,7 @@
         $select->nothinglabel = $strchoosefiletoedit;
         $select->set_label($selectionlabel);
         echo $OUTPUT->select($select);
-        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
+        echo $OUTPUT->help_icon(moodle_help_icon::make('langswitchstorage', $strfilestoredinhelp));
         echo $OUTPUT->box_end();
 
         if (!empty($currentfile)) {
@@ -785,8 +785,8 @@
                     //
                     // webserver is unable to create new file
                     //
-                    notify(get_string('filemissing', '', "$saveto/$currentfile" ));
-                    notify(get_string('makeeditable', '', "$saveto/$currentfile"));
+                    echo $OUTPUT->notification(get_string('filemissing', '', "$saveto/$currentfile" ));
+                    echo $OUTPUT->notification(get_string('makeeditable', '', "$saveto/$currentfile"));
                     $editable = false;
                 } else {
                     //
@@ -803,7 +803,7 @@
                 // file exists but it is not writeable by web server process :-(
                 //
                 $editable = false;
-                notify(get_string('makeeditable', '', "$saveto/$currentfile"));
+                echo $OUTPUT->notification(get_string('makeeditable', '', "$saveto/$currentfile"));
             }
 
             // master en_utf8 in dataroot is not editable
@@ -814,11 +814,11 @@
             echo '<div>';
 
             if ($uselocal) {
-                $strsavetotitle = $strlanglocalpackage . helpbutton('langpackages', $strlanglocalpackage, 'moodle', true, false, '', true);
-                $straltdirtitle = $strlangmasterpackage . helpbutton('langpackages', $strlangmasterpackage, 'moodle', true, false, '', true);
+                $strsavetotitle = $strlanglocalpackage . $OUTPUT->help_icon(moodle_help_icon::make('langpackages', $strlanglocalpackage));
+                $straltdirtitle = $strlangmasterpackage . $OUTPUT->help_icon(moodle_help_icon::make('langpackages', $strlangmasterpackage));
             } else {
-                $straltdirtitle = $strlanglocalpackage . helpbutton('langpackages', $strlanglocalpackage, 'moodle', true, false, '', true);
-                $strsavetotitle = $strlangmasterpackage . helpbutton('langpackages', $strlangmasterpackage, 'moodle', true, false, '', true);
+                $straltdirtitle = $strlanglocalpackage . $OUTPUT->help_icon(moodle_help_icon::make('langpackages', $strlanglocalpackage));
+                $strsavetotitle = $strlangmasterpackage . $OUTPUT->help_icon(moodle_help_icon::make('langpackages', $strlangmasterpackage));
 
             }
 
@@ -874,7 +874,7 @@
             }
             if (is_readable($ensrc)) {
                 echo '<fieldset><legend>'.$strlangmasterenglish;
-                helpbutton('langpackages', $strlangmasterenglish);
+                echo $OUTPUT->help_icon(moodle_help_icon::make('langpackages', $strlangmasterenglish));
                 echo '</legend>';
                 echo "<div class='mdl-align'>\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
                 echo htmlspecialchars(file_get_contents($ensrc));
@@ -1349,13 +1349,13 @@ function lang_help_preview_url($currentfile, $skiplocal=false, $forcelang = '')
  * @return bool False if save failed, true otherwise
  */
 function lang_help_save_file($helproot, $file, $content) {
-    global $CFG, $USER;
+    global $CFG, $USER, $OUTPUT;
 
     $content = str_replace("\r", "",$content);              // Remove linefeed characters
     $content = preg_replace("/\n{3,}/", "\n\n", $content);  // Collapse runs of blank lines
     $content = trim($content);                              // Delete leading/trailing whitespace
     if (is_readable("$helproot/$file") && filesize("$helproot/$file") > 0 && $content == '') {
-        notify(get_string('langrmyourself', 'admin'));
+        echo $OUTPUT->notification(get_string('langrmyourself', 'admin'));
         return true;
     }
 
diff --git a/admin/langimport.php b/admin/langimport.php
index 31e37c5626..15f5717c32 100755
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -91,7 +91,7 @@
 
                         }
                     } else {
-                        notify('Had an unspecified error with the component installer, sorry.');
+                        echo $OUTPUT->notification('Had an unspecified error with the component installer, sorry.');
                     }
                 }
             }
@@ -282,12 +282,12 @@
 
     if ($notice_ok) {
         $info = implode('<br />', $notice_ok);
-        notify($info, 'notifysuccess');
+        echo $OUTPUT->notification($info, 'notifysuccess');
     }
 
     if ($notice_error) {
         $info = implode('<br />', $notice_error);
-        notify($info, 'notifyproblem');
+        echo $OUTPUT->notification($info, 'notifyproblem');
     }
 
     if ($missingparents) {
@@ -306,7 +306,7 @@
                 }
             }
             $info = get_string('missinglangparent', 'admin', $a);
-            notify($info, 'notifyproblem');
+            echo $OUTPUT->notification($info, 'notifyproblem');
         }
     }
 
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 242e0a79a0..f6c0006ead 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -193,7 +193,7 @@ if (!empty($table)) {
 
 
 // output the add form
-print_simple_box_start('center','90%','','20');
+echo $OUTPUT->box_start();
 
 ?>
  <div class="mnetaddtoaclform">
@@ -233,7 +233,7 @@ foreach ($formerror as $error) {
     echo "<br><span class=\"error\">$error<span>";
 }
 
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 
 ?>
diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index 78baffdb18..a661964e84 100644
--- a/admin/mnet/enr_course_enrol.php
+++ b/admin/mnet/enr_course_enrol.php
@@ -301,7 +301,7 @@ if (!empty($errors)) {
         $msg .= $e.'<br />';
     }
     $msg .= '</p>';
-    notify($msg);
+    echo $OUTPUT->notification($msg);
 }
 
 
diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index b521cb7e14..37bcdecb69 100644
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -19,7 +19,7 @@ if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
 }
 print_tabs(array($tabs), 'mnetdetails');
 
-print_simple_box_start("center", "");
+echo $OUTPUT->box_start();
 ?>
 <form method="post" action="peers.php">
 <div>
@@ -46,7 +46,7 @@ if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';
     <td align="right" valign="top"><?php
         print_string('publickey', 'mnet');
         echo ': <br />';
-        helpbutton("publickey", get_string('publickey', 'mnet'), "mnet", true, true);
+        echo $OUTPUT->help_icon(moodle_help_icon::make("publickey", get_string('publickey', 'mnet'), "mnet", true));
     ?></td>
 <?php
 
@@ -119,7 +119,7 @@ if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
     <tr>
         <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
         echo ': <br />';
-        helpbutton("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true, true);
+        echo $OUTPUT->help_icon(moodle_help_icon::make("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true));
         ?>:</td>
         <td valign="top"><?php echo $mnet_peer->ip_address; ?></td>
     </tr>
@@ -152,6 +152,6 @@ if (!empty($credentials)) {
 </div>
 </form>
 <?php
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 ?>
diff --git a/admin/mnet/mnet_review_allhosts.html b/admin/mnet/mnet_review_allhosts.html
index 03002eed70..4c03332def 100644
--- a/admin/mnet/mnet_review_allhosts.html
+++ b/admin/mnet/mnet_review_allhosts.html
@@ -6,7 +6,7 @@ $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid=
 $tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
 print_tabs(array($tabs), 'mnetdetails');
 
-print_simple_box_start("center", "");
+echo $OUTPUT->box_start();
 ?>
 <table cellpadding="9" cellspacing="0" >
 <tr>
@@ -18,6 +18,6 @@ print_simple_box_start("center", "");
 </tr>
 </table>
 <?php
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 ?>
diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html
index 31f8af6ea9..dd7063f8bc 100644
--- a/admin/mnet/mnet_services.html
+++ b/admin/mnet/mnet_services.html
@@ -14,7 +14,7 @@ if ($mnet_peer->id != $CFG->mnet_all_hosts_id && $mnet_peer->application->name =
     $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
 }
 print_tabs(array($tabs), 'mnetservices');
-print_simple_box_start("center", "");
+echo $OUTPUT->box_start();
 
 ?>
 
@@ -101,6 +101,6 @@ print_simple_box_start("center", "");
 </div>
 </form>
 <?php
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 ?>
diff --git a/admin/modules.php b/admin/modules.php
index cf9e69b081..6bbbdbdf43 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -97,14 +97,14 @@
             if ($coursemods = $DB->get_records("course_modules", array("module"=>$module->id))) {
                 foreach ($coursemods as $coursemod) {
                     if (! delete_mod_from_section($coursemod->id, $coursemod->section)) {
-                        notify("Could not delete the $strmodulename with id = $coursemod->id from section $coursemod->section");
+                        echo $OUTPUT->notification("Could not delete the $strmodulename with id = $coursemod->id from section $coursemod->section");
                     }
                 }
             }
 
             // delete calendar events
             if (!$DB->delete_records("event", array("modulename"=>$delete))) {
-                notify("Error occurred while deleting all $strmodulename records in calendar event table");
+                echo $OUTPUT->notification("Error occurred while deleting all $strmodulename records in calendar event table");
             }
 
             // clear course.modinfo for courses
@@ -118,34 +118,34 @@
 
             // Now delete all the course module records
             if (!$DB->delete_records("course_modules", array("module"=>$module->id))) {
-                notify("Error occurred while deleting all $strmodulename records in course_modules table");
+                echo $OUTPUT->notification("Error occurred while deleting all $strmodulename records in course_modules table");
             }
             if ($coursemods) {
                 foreach ($coursemods as $coursemod) {
                     if (!delete_context(CONTEXT_MODULE, $coursemod->id)) {
-                        notify("Could not delete the context for $strmodulename with id = $coursemod->id");
+                        echo $OUTPUT->notification("Could not delete the context for $strmodulename with id = $coursemod->id");
                     }
                 }
             }
 
             // Then delete all the logs
             if (!$DB->delete_records("log", array("module"=>$module->name))) {
-                notify("Error occurred while deleting all $strmodulename records in log table");
+                echo $OUTPUT->notification("Error occurred while deleting all $strmodulename records in log table");
             }
 
             // And log_display information
             if (!$DB->delete_records("log_display", array("module"=>$module->name))) {
-                notify("Error occurred while deleting all $strmodulename records in log_display table");
+                echo $OUTPUT->notification("Error occurred while deleting all $strmodulename records in log_display table");
             }
 
             // And the module entry itself
             if (!$DB->delete_records("modules", array("name"=>$module->name))) {
-                notify("Error occurred while deleting the $strmodulename record from modules table");
+                echo $OUTPUT->notification("Error occurred while deleting the $strmodulename record from modules table");
             }
 
             // And the module configuration records
             if (!unset_all_config_for_plugin($module->name)) {
-                notify(get_string('errordeletingconfig', 'admin', $strmodulename));
+                echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', $strmodulename));
             }
 
             // cleanup the gradebook
@@ -167,7 +167,7 @@
                 $uninstallfunction = $module->name . '_uninstall';
                 if (function_exists($uninstallfunction)) {
                     if (! $uninstallfunction() ) {
-                        notify('Encountered a problem running uninstall function for '. $module->name.'!');
+                        echo $OUTPUT->notification('Encountered a problem running uninstall function for '. $module->name.'!');
                     }
                 }
             }
diff --git a/admin/multilangupgrade.php b/admin/multilangupgrade.php
index 125439474c..22e7860600 100644
--- a/admin/multilangupgrade.php
+++ b/admin/multilangupgrade.php
@@ -28,7 +28,7 @@ if (!$tables = $DB->get_tables() ) {    // No tables yet at all.
     print_error('notables', 'debug');
 }
 
-print_simple_box_start('center');
+echo $OUTPUT->box_start();
 
 /// Turn off time limits, sometimes upgrades can be slow.
 
@@ -93,14 +93,14 @@ foreach ($tables as $table) {
 // set conversion flag - switches to new plugin automatically
 set_config('filter_multilang_converted', 1);
 
-print_simple_box_end();
+echo $OUTPUT->box_end();
 
 /// Rebuild course cache which might be incorrect now
-notify('Rebuilding course cache...', 'notifysuccess');
+echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
 rebuild_course_cache();
-notify('...finished', 'notifysuccess');
+echo $OUTPUT->notification('...finished', 'notifysuccess');
 
-print_continue('index.php');
+echo $OUTPUT->continue_button('index.php');
 
 echo $OUTPUT->footer();
 die;
diff --git a/admin/portfolio.php b/admin/portfolio.php
index 1c8a8ac18f..fbba7452f2 100644
--- a/admin/portfolio.php
+++ b/admin/portfolio.php
@@ -68,9 +68,9 @@ if (!empty($edit) || !empty($new)) {
     } else {
         admin_externalpage_print_header();
         echo $OUTPUT->heading(get_string('configplugin', 'portfolio'));
-        print_simple_box_start();
+        echo $OUTPUT->box_start();
         $mform->display();
-        print_simple_box_end();
+        echo $OUTPUT->box_end();
         $return = false;
     }
 } else if (!empty($hide)) {
diff --git a/admin/qtypes.php b/admin/qtypes.php
index 2dafdc9d7a..fb5cb7f24c 100644
--- a/admin/qtypes.php
+++ b/admin/qtypes.php
@@ -135,7 +135,7 @@
 
         // Delete any configuration records.
         if (!unset_all_config_for_plugin('qtype_' . $delete)) {
-            notify(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
+            echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
         }
         unset_config($delete . '_disabled', 'question');
         unset_config($delete . '_sortorder', 'question');
@@ -149,7 +149,7 @@
         $a->qtype = $qtypename;
         $a->directory = $QTYPES[$delete]->plugin_dir();
         echo $OUTPUT->box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
-        print_continue(admin_url('qtypes.php'));
+        echo $OUTPUT->continue_button(admin_url('qtypes.php'));
         echo $OUTPUT->footer();
         exit;
     }
diff --git a/admin/register.php b/admin/register.php
index a712d37552..f47d0a9ffb 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -38,7 +38,7 @@
 
     echo $OUTPUT->heading($strregistration);
 
-    print_simple_box($strregistrationinfo, "center", "70%");
+    echo $OUTPUT->box($strregistrationinfo);
 
 
 /// Print the form
diff --git a/admin/replace.php b/admin/replace.php
index 740053265f..418acb4c19 100644
--- a/admin/replace.php
+++ b/admin/replace.php
@@ -18,7 +18,7 @@ echo $OUTPUT->heading('Search and replace text throughout the whole database');
 
 if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
-    print_simple_box_start('center');
+    echo $OUTPUT->box_start();
     echo '<div class="mdl-align">';
     echo '<form action="replace.php" method="post">';
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
@@ -27,21 +27,21 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     echo '<input type="submit" value="Yes, do it now" /><br />';
     echo '</form>';
     echo '</div>';
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
     echo $OUTPUT->footer();
     die;
 }
 
-print_simple_box_start('center');
+echo $OUTPUT->box_start();
 
 if (!db_replace($search, $replace)) {
     print_error('erroroccur', debug);
 }
 
-print_simple_box_end();
+echo $OUTPUT->box_end();
 
 /// Try to replace some well-known serialised contents (html blocks)
-notify('Replacing in html blocks...');
+echo $OUTPUT->notification('Replacing in html blocks...');
 $instances = $DB->get_recordset('block_instances', array('blockname' => 'html'));
 foreach ($instances as $instance) {
     $blockobject = block_instance('html', $instance);
@@ -51,11 +51,11 @@ foreach ($instances as $instance) {
 $instances->close();
 
 /// Rebuild course cache which might be incorrect now
-notify('Rebuilding course cache...', 'notifysuccess');
+echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
 rebuild_course_cache();
-notify('...finished', 'notifysuccess');
+echo $OUTPUT->notification('...finished', 'notifysuccess');
 
-print_continue('index.php');
+echo $OUTPUT->continue_button('index.php');
 
 echo $OUTPUT->footer();
 
diff --git a/admin/report/backups/index.php b/admin/report/backups/index.php
index 2a685d0de9..f4146eb40c 100644
--- a/admin/report/backups/index.php
+++ b/admin/report/backups/index.php
@@ -18,7 +18,7 @@
 /// Scheduled backups aren't active by the site admin
     $backup_config = backup_get_config();
     if (empty($backup_config->backup_sche_active)) {
-        notify(get_string('scheduledbackupsinactive'));
+        echo $OUTPUT->notification(get_string('scheduledbackupsinactive'));
     }
 
 /// Get needed strings
@@ -44,12 +44,12 @@
 /// Lastlog view
     if (!$courseid) {
         echo $OUTPUT->heading($backuploglaststatus);
-        print_simple_box_start('center');
+        echo $OUTPUT->box_start();
     /// Now, get every record from backup_courses
         $courses = $DB->get_records("backup_courses");
 
         if (!$courses) {
-            notify(get_string('nologsfound'));
+            echo $OUTPUT->notification(get_string('nologsfound'));
         } else {
             echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
             //Print table header
@@ -82,7 +82,7 @@
             }
             echo "</table>";
         }
-        print_simple_box_end();
+        echo $OUTPUT->box_end();
 /// Detailed View !!
     } else {
         echo $OUTPUT->heading($backuplogdetailed);
@@ -90,7 +90,7 @@
         $coursename = $DB->get_field("course", "fullname", array("id"=>"$courseid"));
         echo $OUTPUT->heading("$strcourse: $coursename");
 
-        print_simple_box_start('center');
+        echo $OUTPUT->box_start();
 
     /// First, me get all the distinct backups for that course in backup_log
         $executions = $DB->get_records_sql("SELECT DISTINCT laststarttime,laststarttime
@@ -100,13 +100,13 @@
 
     /// Iterate over backup executions
         if (!$executions) {
-            notify(get_string('nologsfound'));
+            echo $OUTPUT->notification(get_string('nologsfound'));
         } else {
             echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
             foreach($executions as $execution) {
                 echo "<tr>";
                 echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
-                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
+                echo $OUTPUT->box(userdate($execution->laststarttime));
                 echo "</td>";
                 echo "</tr>";
                 $logs = $DB->get_records_sql("SELECT *
@@ -126,7 +126,7 @@
             }
             echo "</table>";
         }
-        print_simple_box_end();
+        echo $OUTPUT->box_end();
     }
 
     echo $OUTPUT->footer();
diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php
index 3c95477c57..54dbae9fb7 100644
--- a/admin/report/courseoverview/index.php
+++ b/admin/report/courseoverview/index.php
@@ -88,7 +88,8 @@
         $courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
 
         if (empty($courses)) {
-            notify(get_string('statsnodata'));echo '</td></tr></table>';echo '<p>after notify</p>';
+            echo $OUTPUT->notification(get_string('statsnodata'));
+            echo '</td></tr></table>';echo '<p>after notify</p>';
 
         } else {
             if (empty($CFG->gdversion)) {
diff --git a/admin/report/security/index.php b/admin/report/security/index.php
index 7a2a1ec84f..18a5e34048 100644
--- a/admin/report/security/index.php
+++ b/admin/report/security/index.php
@@ -96,7 +96,7 @@ if ($issue and ($result = $issue(true))) {
 
     echo $OUTPUT->box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
 
-    print_continue($url);
+    echo $OUTPUT->continue_button($url);
 
 } else {
     report_security_hide_timearning();
diff --git a/admin/report/unittest/ex_reporter.php b/admin/report/unittest/ex_reporter.php
index df16d3673c..8ac3f88eaf 100644
--- a/admin/report/unittest/ex_reporter.php
+++ b/admin/report/unittest/ex_reporter.php
@@ -116,14 +116,15 @@ class ExHtmlReporter extends HtmlReporter {
      * @param string $message Text to display.
      */
     function paintMessage($message) {
+        global $OUTPUT;
         if ($this->showpasses) {
-            print_simple_box_start('', '100%');
+            echo $OUTPUT->box_start();
             echo '<span class="notice">', $this->get_string('notice'), '</span>: ';
             $breadcrumb = $this->getTestList();
             array_shift($breadcrumb);
             echo implode($this->strseparator, $breadcrumb);
             echo $this->strseparator, '<br />', $message, "\n";
-            print_simple_box_end();
+            echo $OUTPUT->box_end();
             flush();
         }
     }
diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index a6090ca38f..6f4199acbd 100644
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -77,7 +77,7 @@ if (!is_null($path)) {
     } else if (is_dir($path)){
         $test->findTestFiles($path);
     } else {
-        print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
+        echo $OUTPUT->box(get_string('pathdoesnotexist', $langfile, $path), 'errorbox');
         $ok = false;
     }
 
diff --git a/admin/roles/allow.php b/admin/roles/allow.php
index ba986026d5..c0b6f3dab5 100755
--- a/admin/roles/allow.php
+++ b/admin/roles/allow.php
@@ -72,7 +72,7 @@
 
     $table = $controller->get_table();
 
-    print_simple_box($controller->get_intro_text(), 'center');
+    echo $OUTPUT->box($controller->get_intro_text());
 
     echo '<form action="' . $baseurl . '" method="post">';
     echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index e449c95a68..6ffa560bec 100755
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -334,7 +334,7 @@
               if ($hidden) { echo 'checked="checked" '; } ?>/>
               <label for="hidden" title="<?php print_string('createhiddenassign', 'role'); ?>">
                   <?php print_string('hidden', 'role'); ?>
-                  <?php helpbutton('hiddenassign', get_string('createhiddenassign', 'role')); ?>
+                  <?php echo $OUTPUT->help_icon(moodle_help_icon::make('hiddenassign', get_string('createhiddenassign', 'role'))); ?>
               </label></p>
 
               <p><label for="extendperiod"><?php print_string('enrolperiod') ?></label><br />
@@ -366,9 +366,9 @@
                 $msg .= $e.'<br />';
             }
             $msg .= '</p>';
-            print_simple_box_start('center');
-            notify($msg);
-            print_simple_box_end();
+            echo $OUTPUT->box_start();
+            echo $OUTPUT->notification($msg);
+            echo $OUTPUT->box_end();
         }
 
     /// Print a form to swap roles, and a link back to the all roles list.
diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index 19740f25aa..71e889d4ca 100644
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -373,8 +373,9 @@ abstract class capability_table_with_risks extends capability_table_base {
     }
 
     protected function add_header_cells() {
+        global $OUTPUT;
         echo '<th colspan="' . count($this->displaypermissions) . '" scope="col">' .
-                get_string('permission', 'role') . ' ' . helpbutton('permissions', get_string('permissions', 'role'), '', true, false, '', true) . '</th>';
+                get_string('permission', 'role') . ' ' . $OUTPUT->help_icon(moodle_help_icon::make('permissions', get_string('permissions', 'role'))) . '</th>';
         echo '<th class="risk" colspan="' . count($this->allrisks) . '" scope="col">' . get_string('risks','role') . '</th>';
     }
 
diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 438611f03c..cf8bebd367 100755
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -201,7 +201,7 @@
     $table->wrap = array('nowrap', '', 'nowrap','nowrap');
     $table->width = '90%';
     $table->head = array(
-        get_string('role') . ' ' . helpbutton('roles', get_string('roles'), 'moodle', true, false, '', true),
+        get_string('role') . ' ' . $OUTPUT->help_icon(moodle_help_icon::make('roles', get_string('roles'))),
         get_string('description'),
         get_string('shortname'),
         get_string('edit')
diff --git a/admin/search.php b/admin/search.php
index 112f27e0be..11d0a76b0b 100644
--- a/admin/search.php
+++ b/admin/search.php
@@ -37,10 +37,10 @@ if ($data = data_submitted() and confirm_sesskey()) {
 admin_externalpage_print_header($focus);
 
 if ($errormsg !== '') {
-    notify ($errormsg);
+    echo $OUTPUT->notification($errormsg);
 
 } else if ($statusmsg !== '') {
-    notify ($statusmsg, 'notifysuccess');
+    echo $OUTPUT->notification($statusmsg, 'notifysuccess');
 }
 
 $resultshtml = admin_search_settings_html($query); // case insensitive search only
diff --git a/admin/settings.php b/admin/settings.php
index 612db979ba..59f1724fdc 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -58,13 +58,13 @@ if ($PAGE->user_allowed_editing() && $adminediting != -1) {
 /// print header stuff ------------------------------------------------------------
 if (empty($SITE->fullname)) {
     print_header($settingspage->visiblename, $settingspage->visiblename, '', $focus);
-    print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');
+    echo $OUTPUT->box(get_string('configintrosite', 'admin'));
 
     if ($errormsg !== '') {
-        notify ($errormsg);
+        echo $OUTPUT->notification($errormsg);
 
     } else if ($statusmsg !== '') {
-        notify ($statusmsg, 'notifysuccess');
+        echo $OUTPUT->notification($statusmsg, 'notifysuccess');
     }
 
     // ---------------------------------------------------------------------------------------------------------------
@@ -105,10 +105,10 @@ if (empty($SITE->fullname)) {
     print_header("$SITE->shortname: " . implode(": ",$visiblepathtosection), $SITE->fullname, $navigation, $focus, '', true, $buttons, '');
 
     if ($errormsg !== '') {
-        notify ($errormsg);
+        echo $OUTPUT->notification($errormsg);
 
     } else if ($statusmsg !== '') {
-        notify ($statusmsg, 'notifysuccess');
+        echo $OUTPUT->notification($statusmsg, 'notifysuccess');
     }
 
     // ---------------------------------------------------------------------------------------------------------------
diff --git a/admin/timezone.php b/admin/timezone.php
index 57f68a2e72..1be7c872dc 100644
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -29,7 +29,7 @@
 
         $USER->timezone = $zone;
         $current = $zone;
-        notify('Timezone of all users changed', 'notifysuccess');
+        echo $OUTPUT->notification('Timezone of all users changed', 'notifysuccess');
     } else {
         $current = 99;
     }
diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php
index 23b0a323ba..c7b47b4255 100644
--- a/admin/timezoneimport.php
+++ b/admin/timezoneimport.php
@@ -94,7 +94,7 @@
         $a->source  = $importdone;
         echo $OUTPUT->heading(get_string('importtimezonescount', 'admin', $a), 3);
 
-        print_continue('index.php');
+        echo $OUTPUT->continue_button('index.php');
 
         $timezonelist = array();
         foreach ($timezones as $timezone) {
@@ -110,15 +110,15 @@
         ksort($timezonelist);
 
         echo "<br />";
-        print_simple_box_start('center');
+        echo $OUTPUT->box_start();
         foreach ($timezonelist as $name => $count) {
             echo "$name ($count)<br />";
         }
-        print_simple_box_end();
+        echo $OUTPUT->box_end();
 
     } else {
         echo $OUTPUT->heading(get_string('importtimezonesfailed', 'admin'), 3);
-        print_continue('index.php');
+        echo $OUTPUT->continue_button('index.php');
     }
 
     echo $OUTPUT->footer();
diff --git a/admin/uploadpicture.php b/admin/uploadpicture.php
index 8f8a44daf6..0b18366e6d 100644
--- a/admin/uploadpicture.php
+++ b/admin/uploadpicture.php
@@ -64,7 +64,7 @@ print_heading_with_help($struploadpictures, 'uploadpictures');
 $mform = new admin_uploadpicture_form(null, $userfields);
 if ($formdata = $mform->get_data()) {
     if (!array_key_exists($userfield, $userfields)) {
-        notify(get_string('uploadpicture_baduserfield','admin'));
+        echo $OUTPUT->notification(get_string('uploadpicture_baduserfield','admin'));
     } else {
         // Large files are likely to take their time and memory. Let PHP know
         // that we'll take longer, and that the process should be recycled soon
@@ -81,11 +81,11 @@ if ($formdata = $mform->get_data()) {
         $dstfile = $zipodir.'/images.zip';
         
         if (!$mform->save_file('userfile', $dstfile, true)) {
-            notify(get_string('uploadpicture_cannotmovezip','admin'));
+            echo $OUTPUT->notification(get_string('uploadpicture_cannotmovezip','admin'));
             @remove_dir($zipdir);
         } else {
             if (!unzip_file($dstfile, $zipdir, false)) {
-                notify(get_string('uploadpicture_cannotunzip','admin'));
+                echo $OUTPUT->notification(get_string('uploadpicture_cannotunzip','admin'));
                 @remove_dir($zipdir);
             } else {
                 // We don't need the zip file any longer, so delete it to make
@@ -99,8 +99,8 @@ if ($formdata = $mform->get_data()) {
             
                 // Finally remove the temporary directory with all the user images and print some stats.
                 remove_dir($zipdir);
-                notify(get_string('usersupdated', 'admin') . ": " . $results['updated']);
-                notify(get_string('errors', 'admin') . ": " . $results['errors']);
+                echo $OUTPUT->notification(get_string('usersupdated', 'admin') . ": " . $results['updated']);
+                echo $OUTPUT->notification(get_string('errors', 'admin') . ": " . $results['errors']);
                 echo '<hr />';
             }
         }
@@ -149,8 +149,9 @@ function my_mktempdir($dir, $prefix='', $mode=0700) {
  * @return nothing
  */
 function process_directory ($dir, $userfield, $overwrite, &$results) {
+    global $OUTPUT;
     if(!($handle = opendir($dir))) {
-        notify(get_string('uploadpicture_cannotprocessdir','admin'));
+        echo $OUTPUT->notification(get_string('uploadpicture_cannotprocessdir','admin'));
         return;
     }
 
@@ -191,7 +192,7 @@ function process_directory ($dir, $userfield, $overwrite, &$results) {
  *                  PIX_FILE_SKIPPED
  */
 function process_file ($file, $userfield, $overwrite) {
-    global $DB;
+    global $DB, $OUTPUT;
     
     // Add additional checks on the filenames, as they are user
     // controlled and we don't want to open any security holes.
@@ -200,7 +201,7 @@ function process_file ($file, $userfield, $overwrite) {
     $extension = $path_parts['extension'];
     if ($basename != clean_param($basename, PARAM_FILE)) {
         // The original picture file name has invalid characters
-        notify(get_string('uploadpicture_invalidfilename', 'admin',
+        echo $OUTPUT->notification(get_string('uploadpicture_invalidfilename', 'admin',
                           clean_param($basename, PARAM_CLEANHTML)));
         return PIX_FILE_ERROR;
     }
@@ -216,22 +217,22 @@ function process_file ($file, $userfield, $overwrite) {
         $a = new Object();
         $a->userfield = clean_param($userfield, PARAM_CLEANHTML);
         $a->uservalue = clean_param($uservalue, PARAM_CLEANHTML);
-        notify(get_string('uploadpicture_usernotfound', 'admin', $a));
+        echo $OUTPUT->notification(get_string('uploadpicture_usernotfound', 'admin', $a));
         return PIX_FILE_ERROR;
     }
 
     $haspicture = $DB->get_field('user', 'picture', array('id'=>$user->id));
     if ($haspicture && !$overwrite) {
-        notify(get_string('uploadpicture_userskipped', 'admin', $user->username));
+        echo $OUTPUT->notification(get_string('uploadpicture_userskipped', 'admin', $user->username));
         return PIX_FILE_SKIPPED;
     }
 
     if (my_save_profile_image($user->id, $file)) {
         $DB->set_field('user', 'picture', 1, array('id'=>$user->id));
-        notify(get_string('uploadpicture_userupdated', 'admin', $user->username));
+        echo $OUTPUT->notification(get_string('uploadpicture_userupdated', 'admin', $user->username));
         return PIX_FILE_UPDATED;
     } else {
-        notify(get_string('uploadpicture_cannotsave', 'admin', $user->username));
+        echo $OUTPUT->notification(get_string('uploadpicture_cannotsave', 'admin', $user->username));
         return PIX_FILE_ERROR;
     }
 }
diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index a89ee243f0..fc0924b7bd 100755
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -729,9 +729,9 @@ if ($formdata = $mform->is_cancelled()) {
     echo $OUTPUT->box_end();
 
     if ($bulk) {
-        print_continue($bulknurl);
+        echo $OUTPUT->continue_button($bulknurl);
     } else {
-        print_continue($returnurl);
+        echo $OUTPUT->continue_button($returnurl);
     }
     echo $OUTPUT->footer();
     die;
diff --git a/admin/user.php b/admin/user.php
index a6a3ad4488..0496b9c316 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -83,7 +83,7 @@
             } else {
                 session_gc(); // remove stale sessions
                 admin_externalpage_print_header();
-                notify($returnurl, get_string('deletednot', '', fullname($user, true)));
+                echo $OUTPUT->notification($returnurl, get_string('deletednot', '', fullname($user, true)));
             }
         }
     } else if ($acl and confirm_sesskey()) {
diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php
index b5b4c1efc2..6a944fb900 100755
--- a/admin/user/user_bulk_confirm.php
+++ b/admin/user/user_bulk_confirm.php
@@ -32,7 +32,7 @@ if ($confirm and confirm_sesskey()) {
             $auth = get_auth_plugin($user->auth);
             $result = $auth->user_confirm($user->username, $user->secret);
             if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
-                notify(get_string('usernotconfirmed', '', fullname($user, true)));
+                echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
             }
         }
         $rs->close();
diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php
index 559bef48d0..aef04b38f5 100755
--- a/admin/user/user_bulk_delete.php
+++ b/admin/user/user_bulk_delete.php
@@ -31,7 +31,7 @@ if ($confirm and confirm_sesskey()) {
             if ($primaryadmin->id != $user->id and $USER->id != $user->id and delete_user($user)) {
                 unset($SESSION->bulk_users[$user->id]);
             } else {
-                notify(get_string('deletednot', '', fullname($user, true)));
+                echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
             }
         }
         $rs->close;
diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php
index 90b88d4350..eead78be3c 100755
--- a/admin/user/user_bulk_display.php
+++ b/admin/user/user_bulk_display.php
@@ -75,7 +75,7 @@ foreach($users as $user) {
 echo $OUTPUT->heading("$usercount / $usertotal ".get_string('users'));
 print_table($table);
 
-print_continue($return);
+echo $OUTPUT->continue_button($return);
 
 echo $OUTPUT->footer();
 ?>
diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php
index 1032b2cf50..8f46f3f319 100755
--- a/admin/user/user_bulk_download.php
+++ b/admin/user/user_bulk_download.php
@@ -64,7 +64,7 @@ echo '<li><a href="user_bulk_download.php?format=xls">'.get_string('downloadexce
 echo '</ul>';
 echo $OUTPUT->box_end();
 
-print_continue($return);
+echo $OUTPUT->continue_button($return);
 
 echo $OUTPUT->footer();
 
diff --git a/admin/wsprotocols.php b/admin/wsprotocols.php
index 59599ff65c..602a201427 100644
--- a/admin/wsprotocols.php
+++ b/admin/wsprotocols.php
@@ -39,9 +39,9 @@ if (!empty($hide)) {
         redirect($baseurl,get_string("changessaved"));
     }
 
-    print_simple_box_start();
+    echo $OUTPUT->box_start();
     $mform->display();
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
 
 } else if (!empty($settings)) {
 /// Server settings page
@@ -72,9 +72,9 @@ if (!empty($hide)) {
         redirect($baseurl,get_string("changessaved")); // return to the security web service page
     }
 /// display the server settings form
-    print_simple_box_start();
+    echo $OUTPUT->box_start();
     $mform->display();
-    print_simple_box_end();
+    echo $OUTPUT->box_end();
 } else {
     $return = true;
 }
diff --git a/admin/xmldb/actions/XMLDBCheckAction.class.php b/admin/xmldb/actions/XMLDBCheckAction.class.php
index ff84c87406..255c8a7106 100644
--- a/admin/xmldb/actions/XMLDBCheckAction.class.php
+++ b/admin/xmldb/actions/XMLDBCheckAction.class.php
@@ -76,7 +76,7 @@ abstract class XMLDBCheckAction extends XMLDBAction {
         $this->does_generate = ACTION_GENERATE_HTML;
 
     /// These are always here
-        global $CFG, $XMLDB, $DB;
+        global $CFG, $XMLDB, $DB, $OUTPUT;
 
     /// And we nedd some ddl suff
         $dbman = $DB->get_manager();
@@ -133,7 +133,7 @@ abstract class XMLDBCheckAction extends XMLDBAction {
                 /// Load the XML contents to structure
                     $loaded = $xmldb_file->loadXMLStructure();
                     if (!$loaded || !$xmldb_file->isLoaded()) {
-                        notify('Errors found in XMLDB file: '. $dbdir->path . '/install.xml');
+                        echo $OUTPUT->notification('Errors found in XMLDB file: '. $dbdir->path . '/install.xml');
                         continue;
                     }
                 /// Arriving here, everything is ok, get the XMLDB structure