From: nicolasconnault <nicolasconnault>
Date: Thu, 20 Aug 2009 13:14:05 +0000 (+0000)
Subject: MDL-19788 Upgraded calls to link_to_popup_window()
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7f383c56769cef18e9f849d619bf34cdb1471e2e;p=moodle.git

MDL-19788 Upgraded calls to link_to_popup_window()
---

diff --git a/auth/cas/config.html b/auth/cas/config.html
index f0742e5124..a4ceb20212 100644
--- a/auth/cas/config.html
+++ b/auth/cas/config.html
@@ -162,7 +162,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         if (isset($err['hostname'])) {
 
-            formerr($err['hostname']);
+            echo $OUTPUT->error_text($err['hostname']);
 
         }
 
@@ -192,7 +192,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         if (isset($err['baseuri'])) {
 
-            formerr($err['baseuri']);
+            echo $OUTPUT->error_text($err['baseuri']);
 
         }
 
@@ -222,7 +222,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         if (isset($err['port'])) {
 
-            formerr($err['port']);
+            echo $OUTPUT->error_text($err['port']);
 
         }
 
@@ -252,7 +252,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         if (isset($err['casversion'])) {
 
-            formerr($err['casversion']);
+            echo $OUTPUT->error_text($err['casversion']);
 
         }
 
@@ -389,7 +389,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         <input name="host_url" id="host_url" type="text" size="30" value="<?php echo $config->host_url?>" />
 
-    <?php  if (isset($err['host_url'])) formerr($err['host_url']); ?>
+    <?php  if (isset($err['host_url'])) echo $OUTPUT->error_text($err['host_url']); ?>
 
     </td>
 
@@ -419,7 +419,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
        echo $OUTPUT->select(html_select::make($versions, 'version', $config->version, false));
 
-       if (isset($err['version'])) formerr($err['version']);
+       if (isset($err['version'])) echo $OUTPUT->error_text($err['version']);
 
     ?>
 
@@ -449,7 +449,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
         if (isset($err['ldapencoding'])) {
 
-            formerr($err['ldapencoding']);
+            echo $OUTPUT->error_text($err['ldapencoding']);
 
         }
 
@@ -485,7 +485,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="bind_dn" id="bind_dn" type="text" size="30" value="<?php echo $config->bind_dn?>" />
 
-    <?php  if (isset($err['bind_dn'])) formerr($err['bind_dn']); ?>
+    <?php  if (isset($err['bind_dn'])) echo $OUTPUT->error_text($err['bind_dn']); ?>
 
     </td><td>
 
@@ -505,7 +505,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="bind_pw" id="bind_pw" type="password" size="30" value="<?php echo $config->bind_pw?>" />
 
-    <?php  if (isset($err['bind_pw'])) formerr($err['bind_pw']); ?>
+    <?php  if (isset($err['bind_pw'])) echo $OUTPUT->error_text($err['bind_pw']); ?>
 
     </td><td>
 
@@ -537,7 +537,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <?php echo $OUTPUT->select(html_select::make($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, false)); ?>
 
-    <?php  if (isset($err['user_type'])) formerr($err['user_type']); ?>
+    <?php  if (isset($err['user_type'])) echo $OUTPUT->error_text($err['user_type']); ?>
 
     </td>
 
@@ -559,7 +559,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="contexts" id="contexts"  type="text" size="30" value="<?php echo $config->contexts?>" />
 
-    <?php  if (isset($err['contexts'])) formerr($err['contexts']); ?>
+    <?php  if (isset($err['contexts'])) echo $OUTPUT->error_text($err['contexts']); ?>
 
     </td>
 
@@ -609,7 +609,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
        echo $OUTPUT->select(html_select::make($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false));
 
-       if (isset($err['opt_deref'])) formerr($err['opt_deref']);
+       if (isset($err['opt_deref'])) echo $OUTPUT->error_text($err['opt_deref']);
 
     ?>
 
@@ -637,7 +637,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="user_attribute" id="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute?>" />
 
-    <?php  if (isset($err['user_attribute'])) formerr($err['user_attribute']); ?>
+    <?php  if (isset($err['user_attribute'])) echo $OUTPUT->error_text($err['user_attribute']); ?>
 
     </td>
 
@@ -659,7 +659,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="memberattribute" id="memberattribute" type="text" size="30" value="<?php echo $config->memberattribute?>" />
 
-    <?php  if (isset($err['memberattribute'])) formerr($err['memberattribute']); ?>
+    <?php  if (isset($err['memberattribute'])) echo $OUTPUT->error_text($err['memberattribute']); ?>
 
     </td><td>
 
@@ -679,7 +679,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="memberattribute_isdn" id="memberattribute_isdn" type="text" size="30" value="<?php echo $config->memberattribute_isdn?>" />
 
-    <?php  if (isset($err['memberattribute_isdn'])) formerr($err['memberattribute_isdn']); ?>
+    <?php  if (isset($err['memberattribute_isdn'])) echo $OUTPUT->error_text($err['memberattribute_isdn']); ?>
 
     </td><td>
 
@@ -699,7 +699,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="objectclass" id="objectclass" type="text" size="30" value="<?php echo $config->objectclass?>" />
 
-    <?php  if (isset($err['objectclass'])) formerr($err['objectclass']); ?>
+    <?php  if (isset($err['objectclass'])) echo $OUTPUT->error_text($err['objectclass']); ?>
 
     </td>
 
@@ -733,7 +733,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="attrcreators" id="attrcreators" type="text" size="30" value="<?php echo $config->attrcreators?>" />
 
-    <?php  if (isset($err['attrcreators'])) formerr($err['attrcreators']); ?>
+    <?php  if (isset($err['attrcreators'])) echo $OUTPUT->error_text($err['attrcreators']); ?>
 
     </td><td>
 
@@ -753,7 +753,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
     <input name="groupecreators" id="groupecreators" type="text" size="30" value="<?php echo $config->groupecreators?>" />
 
-    <?php  if (isset($err['groupecreators'])) formerr($err['groupecreators']); ?>
+    <?php  if (isset($err['groupecreators'])) echo $OUTPUT->error_text($err['groupecreators']); ?>
 
     </td><td>
 
diff --git a/auth/db/config.html b/auth/db/config.html
index a4ddfaca4b..b78643342f 100644
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -59,7 +59,7 @@
         <?php
 
         if (isset($err["host"])) {
-            formerr($err["host"]);
+            echo $OUTPUT->error_text($err["host"]);
         }
 
         ?>
@@ -98,7 +98,7 @@
         <?php
 
         if (isset($err["name"])) {
-            formerr($err["name"]);
+            echo $OUTPUT->error_text($err["name"]);
         }
 
         ?>
@@ -113,7 +113,7 @@
         <?php
 
         if (isset($err["user"])) {
-            formerr($err["user"]);
+            echo $OUTPUT->error_text($err["user"]);
         }
 
         ?>
@@ -128,7 +128,7 @@
         <?php
 
         if (isset($err["pass"])) {
-            formerr($err["pass"]);
+            echo $OUTPUT->error_text($err["pass"]);
         }
 
         ?>
@@ -145,7 +145,7 @@
         <?php
 
         if (isset($err["table"])) {
-            formerr($err["table"]);
+            echo $OUTPUT->error_text($err["table"]);
         }
 
         ?>
@@ -160,7 +160,7 @@
         <?php
 
         if (isset($err["fielduser"])) {
-            formerr($err["fielduser"]);
+            echo $OUTPUT->error_text($err["fielduser"]);
         }
 
         ?>
@@ -175,7 +175,7 @@
         <?php
 
         if (isset($err["fieldpass"])) {
-            formerr($err["fieldpass"]);
+            echo $OUTPUT->error_text($err["fieldpass"]);
         }
 
         ?>
@@ -206,7 +206,7 @@
         <?php
 
         if (isset($err['extencoding'])) {
-            formerr($err['extencoding']);
+            echo $OUTPUT->error_text($err['extencoding']);
         }
 
         ?>
@@ -237,7 +237,7 @@
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/fc/config.html b/auth/fc/config.html
index 3b287310c0..9f44af172d 100644
--- a/auth/fc/config.html
+++ b/auth/fc/config.html
@@ -30,7 +30,7 @@
     <td align="right"><?php  print_string("auth_fchost_key", "auth_fc") ?>:</td>
     <td>
         <input name="host" type="text" size="30" value="<?php echo $config->host?>" />
-    <?php  if (isset($err["host"])) formerr($err["host"]); ?>
+    <?php  if (isset($err["host"])) echo $OUTPUT->error_text($err["host"]); ?>
     </td>
     <td>
     <?php  print_string("auth_fchost", "auth_fc") ?>
@@ -41,7 +41,7 @@
     <td align="right"><?php  print_string("auth_fcfppport_key", "auth_fc") ?>:</td>
     <td>
         <input name="fppport" type="text" size="30" value="<?php echo $config->fppport?>" />
-    <?php  if (isset($err["fppport"])) formerr($err["host"]); ?>
+    <?php  if (isset($err["fppport"])) echo $OUTPUT->error_text($err["host"]); ?>
     </td>
     <td>
     <?php  print_string("auth_fcfppport", "auth_fc") ?>
@@ -52,7 +52,7 @@
     <td align="right"><?php  print_string("auth_fcuserid_key", "auth_fc") ?>:</td>
     <td>
         <input name="userid" type="text" size="30" maxlength="15" value="<?php echo $config->userid?>" />
-    <?php  if (isset($err["userid"])) formerr($err["userid"]); ?>
+    <?php  if (isset($err["userid"])) echo $OUTPUT->error_text($err["userid"]); ?>
     </td>
     <td>
     <?php  print_string("auth_fcuserid", "auth_fc") ?>
@@ -62,7 +62,7 @@
     <td align="right"><?php  print_string("auth_fcpasswd_key", "auth_fc") ?>:</td>
     <td>
         <input name="passwd" type="password" size="30" maxlength="12" value="<?php echo $config->passwd?>" />
-    <?php  if (isset($err["passwd"])) formerr($err["passwd"]); ?>
+    <?php  if (isset($err["passwd"])) echo $OUTPUT->error_text($err["passwd"]); ?>
     </td>
     <td>
     <?php  print_string("auth_fcpasswd", "auth_fc") ?>
@@ -73,7 +73,7 @@
     <td align="right"><?php  print_string("auth_fccreators_key", "auth_fc") ?>:</td>
     <td>
         <input name="creators" type="text" size="30" value="<?php echo $config->creators?>" />
-    <?php  if (isset($err["creators"])) formerr($err["creators"]); ?>
+    <?php  if (isset($err["creators"])) echo $OUTPUT->error_text($err["creators"]); ?>
     </td>
     <td>
     <?php  print_string("auth_fccreators", "auth_fc") ?>
@@ -87,7 +87,7 @@
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/imap/config.html b/auth/imap/config.html
index a1ef40a2ca..31c104093e 100644
--- a/auth/imap/config.html
+++ b/auth/imap/config.html
@@ -24,7 +24,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['host'])) {
-            formerr($err['host']);
+            echo $OUTPUT->error_text($err['host']);
         }
 
         ?>
@@ -62,7 +62,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['port'])) {
-            formerr($err['port']);
+            echo $OUTPUT->error_text($err['port']);
         }
 
         ?>
@@ -77,7 +77,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/ldap/config.html b/auth/ldap/config.html
index dda5127793..4c6a8b2247 100644
--- a/auth/ldap/config.html
+++ b/auth/ldap/config.html
@@ -81,7 +81,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="host_url"><?php print_string('auth_ldap_host_url_key','auth_ldap') ?></label></td>
     <td>
         <input name="host_url" id="host_url" type="text" size="30" value="<?php echo $config->host_url?>" />
-    <?php  if (isset($err['host_url'])) formerr($err['host_url']); ?>
+    <?php  if (isset($err['host_url'])) echo $OUTPUT->error_text($err['host_url']); ?>
     </td>
     <td>
     <?php print_string('auth_ldap_host_url','auth_ldap') ?>
@@ -96,7 +96,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
        $versions[2] = '2';
        $versions[3] = '3';
        echo $OUTPUT->select(html_select::make($versions, 'version', $config->version, false));
-       if (isset($err['version'])) formerr($err['version']);
+       if (isset($err['version'])) echo $OUTPUT->error_text($err['version']);
     ?>
     </td>
     <td>
@@ -111,7 +111,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
         <?php
 
         if (isset($err['ldapencoding'])) {
-            formerr($err['ldapencoding']);
+            echo $OUTPUT->error_text($err['ldapencoding']);
         }
 
         ?>
@@ -138,7 +138,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="bind_dn"><?php print_string('auth_ldap_bind_dn_key','auth_ldap') ?></label></td>
     <td>
     <input name="bind_dn" id="bind_dn" type="text" size="30" value="<?php echo $config->bind_dn?>" />
-    <?php  if (isset($err['bind_dn'])) formerr($err['bind_dn']); ?>
+    <?php  if (isset($err['bind_dn'])) echo $OUTPUT->error_text($err['bind_dn']); ?>
     </td><td>
     <?php print_string('auth_ldap_bind_dn','auth_ldap') ?>
     </td>
@@ -148,7 +148,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="bind_pw"><?php print_string('auth_ldap_bind_pw_key','auth_ldap') ?></label></td>
     <td>
     <input name="bind_pw" id="bind_pw" type="password" size="30" value="<?php echo $config->bind_pw?>" />
-    <?php  if (isset($err['bind_pw'])) formerr($err['bind_pw']); ?>
+    <?php  if (isset($err['bind_pw'])) echo $OUTPUT->error_text($err['bind_pw']); ?>
     </td><td>
     <?php print_string('auth_ldap_bind_pw','auth_ldap') ?>
     </td>
@@ -164,7 +164,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="menuuser_type"><?php print_string('auth_ldap_user_type_key','auth_ldap') ?></label></td>
     <td>
     <?php echo $OUTPUT->select(html_select::make($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, false)); ?>
-    <?php  if (isset($err['user_type'])) formerr($err['user_type']); ?>
+    <?php  if (isset($err['user_type'])) echo $OUTPUT->error_text($err['user_type']); ?>
     </td>
     <td>
     <?php print_string('auth_ldap_user_type', 'auth_ldap') ?>
@@ -175,7 +175,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="contexts"><?php print_string('auth_ldap_contexts_key','auth_ldap') ?></label></td>
     <td>
     <input name="contexts" id="contexts"  type="text" size="30" value="<?php echo $config->contexts?>" />
-    <?php  if (isset($err['contexts'])) formerr($err['contexts']); ?>
+    <?php  if (isset($err['contexts'])) echo $OUTPUT->error_text($err['contexts']); ?>
     </td>
     <td>
     <?php print_string('auth_ldap_contexts', 'auth_ldap') ?>
@@ -200,7 +200,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
        $opt_deref[LDAP_DEREF_NEVER] = get_string('no');
        $opt_deref[LDAP_DEREF_ALWAYS] = get_string('yes');
        echo $OUTPUT->select(html_select::make($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false));
-       if (isset($err['opt_deref'])) formerr($err['opt_deref']);
+       if (isset($err['opt_deref'])) echo $OUTPUT->error_text($err['opt_deref']);
     ?>
     </td>
     <td>
@@ -214,7 +214,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="user_attribute"><?php print_string('auth_ldap_user_attribute_key','auth_ldap') ?></label></td>
     <td>
     <input name="user_attribute" id="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute?>" />
-    <?php  if (isset($err['user_attribute'])) formerr($err['user_attribute']); ?>
+    <?php  if (isset($err['user_attribute'])) echo $OUTPUT->error_text($err['user_attribute']); ?>
     </td>
     <td>
     <?php print_string('auth_ldap_user_attribute','auth_ldap') ?>
@@ -225,7 +225,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
         <td align="right"><label for="memberattribute"><?php print_string('auth_ldap_memberattribute_key','auth_ldap') ?></label></td>
         <td>
     <input name="memberattribute" id="memberattribute" type="text" size="30" value="<?php echo $config->memberattribute?>" />
-    <?php  if (isset($err['memberattribute'])) formerr($err['memberattribute']); ?>
+    <?php  if (isset($err['memberattribute'])) echo $OUTPUT->error_text($err['memberattribute']); ?>
     </td><td>
     <?php print_string('auth_ldap_memberattribute','auth_ldap') ?>
     </td>
@@ -235,7 +235,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
         <td align="right"><label for="memberattribute_isdn"><?php print_string('auth_ldap_memberattribute_isdn_key','auth_ldap') ?></label></td>
         <td>
     <input name="memberattribute_isdn" id="memberattribute_isdn" type="text" size="30" value="<?php echo $config->memberattribute_isdn?>" />
-    <?php  if (isset($err['memberattribute_isdn'])) formerr($err['memberattribute_isdn']); ?>
+    <?php  if (isset($err['memberattribute_isdn'])) echo $OUTPUT->error_text($err['memberattribute_isdn']); ?>
     </td><td>
     <?php print_string('auth_ldap_memberattribute_isdn','auth_ldap') ?>
     </td>
@@ -245,7 +245,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="objectclass"><?php print_string('auth_ldap_objectclass_key','auth_ldap') ?></label></td>
     <td>
     <input name="objectclass" id="objectclass" type="text" size="30" value="<?php echo $config->objectclass?>" />
-    <?php  if (isset($err['objectclass'])) formerr($err['objectclass']); ?>
+    <?php  if (isset($err['objectclass'])) echo $OUTPUT->error_text($err['objectclass']); ?>
     </td>
     <td>
     <?php print_string('auth_ldap_objectclass','auth_ldap') ?>
@@ -301,7 +301,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
@@ -323,7 +323,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
        $expiration['0'] = 'no';
        $expiration['1'] = 'LDAP';
        echo $OUTPUT->select(html_select::make($expiration, 'expiration', $config->expiration, false));
-       if (isset($err['expiration'])) formerr($err['expiration']);
+       if (isset($err['expiration'])) echo $OUTPUT->error_text($err['expiration']);
     ?>
     </td>
     <td>
@@ -336,7 +336,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="expiration_warning"><?php print_string('auth_ldap_expiration_warning_key','auth_ldap') ?></label></td>
     <td>
     <input name="expiration_warning" id="expiration_warning" type="text" size="2" value="<?php echo $config->expiration_warning?>" />
-    <?php   if (isset($err['expiration_warning'])) formerr($err['expiration_warning']);
+    <?php   if (isset($err['expiration_warning'])) echo $OUTPUT->error_text($err['expiration_warning']);
     ?>
     </td>
     <td>
@@ -348,7 +348,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="expireattr"><?php print_string('auth_ldap_expireattr_key','auth_ldap') ?></label></td>
     <td>
     <input name="expireattr" id="expireattr" type="text" size="30" value="<?php echo $config->expireattr?>" />
-    <?php  if (isset($err['expireattr'])) formerr($err['expireattr']);
+    <?php  if (isset($err['expireattr'])) echo $OUTPUT->error_text($err['expireattr']);
     ?>
     </td>
     <td>
@@ -370,7 +370,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="graceattr"><?php print_string('auth_ldap_gracelogin_key','auth_ldap') ?></label></td>
     <td>
     <input name="graceattr" id="graceattr" type="text" size="30" value="<?php echo $config->graceattr?>" />
-    <?php   if (isset($err['graceattr'])) formerr($err['graceattr']);
+    <?php   if (isset($err['graceattr'])) echo $OUTPUT->error_text($err['graceattr']);
     ?>
     </td>
     <td>
@@ -400,7 +400,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     <td align="right"><label for="create_context"><?php print_string('auth_ldap_create_context_key','auth_ldap') ?></label></td>
     <td>
     <input name="create_context" id="create_context" type="text" size="30" value="<?php echo $config->create_context?>" />
-    <?php  if (isset($err['create_context'])) formerr($err['create_context']); ?>
+    <?php  if (isset($err['create_context'])) echo $OUTPUT->error_text($err['create_context']); ?>
     </td><td>
     <?php print_string('auth_ldap_create_context','auth_ldap') ?>
     </td>
@@ -417,7 +417,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
         <td align="right"><label for="creators"><?php print_string('auth_ldap_creators_key','auth_ldap') ?></label></td>
         <td>
     <input name="creators" id="creators" type="text" size="30" value="<?php echo $config->creators?>" />
-    <?php  if (isset($err['creators'])) formerr($err['creators']); ?>
+    <?php  if (isset($err['creators'])) echo $OUTPUT->error_text($err['creators']); ?>
     </td><td>
     <?php print_string('auth_ldap_creators','auth_ldap') ?>
     </td>
diff --git a/auth/mnet/config.html b/auth/mnet/config.html
index d40492028e..a3be452982 100644
--- a/auth/mnet/config.html
+++ b/auth/mnet/config.html
@@ -25,7 +25,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
         <?php
 
         if (isset($err['rpc_negotiation_timeout'])) {
-            formerr($err['rpc_negotiation_timeout']);
+            echo $OUTPUT->error_text($err['rpc_negotiation_timeout']);
         }
 
         ?>
diff --git a/auth/nntp/config.html b/auth/nntp/config.html
index 99ea1db646..5d50324261 100644
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -21,7 +21,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err["host"])) {
-            formerr($err["host"]);
+            echo $OUTPUT->error_text($err["host"]);
         }
 
         ?>
@@ -43,7 +43,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err["port"])) {
-            formerr($err["port"]);
+            echo $OUTPUT->error_text($err["port"]);
         }
 
         ?>
@@ -58,7 +58,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index a17b3ea15c..cdc30cfcee 100644
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -27,7 +27,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['host'])) {
-            formerr($err['host']);
+            echo $OUTPUT->error_text($err['host']);
         }
 
         ?>
@@ -65,7 +65,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['port'])) {
-            formerr($err['port']);
+            echo $OUTPUT->error_text($err['port']);
         }
 
         ?>
@@ -80,7 +80,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['mailbox'])) {
-            formerr($err['mailbox']);
+            echo $OUTPUT->error_text($err['mailbox']);
         }
 
         ?>
@@ -95,7 +95,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/radius/config.html b/auth/radius/config.html
index aa86aa761f..65ae8b6b59 100644
--- a/auth/radius/config.html
+++ b/auth/radius/config.html
@@ -36,7 +36,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['host'])) {
-            formerr($err['host']);
+            echo $OUTPUT->error_text($err['host']);
         }
 
         ?>
@@ -51,7 +51,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['nasport'])) {
-            formerr($err['nasport']);
+            echo $OUTPUT->error_text($err['nasport']);
         }
 
         ?>
@@ -72,7 +72,7 @@ if (!isset($config->changepasswordurl)) {
     echo $OUTPUT->select(html_select::make($radiustype, 'radiustype', $config->radiustype, false));
 
     if (isset($err['radiustype'])) {
-        formerr($err['radiustype']);
+        echo $OUTPUT->error_text($err['radiustype']);
     }
 
 ?>
@@ -88,7 +88,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['secret'])) {
-            formerr($err['secret']);
+            echo $OUTPUT->error_text($err['secret']);
         }
 
         ?>
@@ -103,7 +103,7 @@ if (!isset($config->changepasswordurl)) {
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index 43cc733f29..46097f601c 100755
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -126,7 +126,7 @@ urn:mace:organization2:providerID, Example Organization 2, /Shibboleth.sso/WAYF/
         <?php
 
         if (isset($err['changepasswordurl'])) {
-            formerr($err['changepasswordurl']);
+            echo $OUTPUT->error_text($err['changepasswordurl']);
         }
 
         ?>
diff --git a/auth/shibboleth/index_form.html b/auth/shibboleth/index_form.html
index e8a455c1b0..ade24491d5 100644
--- a/auth/shibboleth/index_form.html
+++ b/auth/shibboleth/index_form.html
@@ -23,7 +23,7 @@ if ($show_instructions) {
         <?php
           if (!empty($errormsg)) {
               echo '<div class="loginerrors">';
-              formerr($errormsg);
+              echo $OUTPUT->error_text($errormsg);
               echo '</div>';
           }