MDL-18041 improved hints - thanks helen; merged from MOODLE_19_STABLE

diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
index 1830fc54359480e3e1a45a3eb76e95a86307d3ed..2daf7dc13318eb1f4e5db1dd2137b06a2695c51f 100644 (file)
--- a/admin/report/security/lib.php
+++ b/admin/report/security/lib.php
@@ -1072,7 +1072,8 @@ function report_security_check_riskadmin($detailed=false) {
             $users = array();
             foreach ($rs as $user) {
                 $url = "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$user->contextid&roleid=$user->roleid";
-                $users[] = '<li><a href="'.$url.'">'.fullname($user).' ('.$user->email.')</a></li>';
+                $a = (object)array('fullname'=>fullname($user), 'url'=>$url, 'email'=>$user->email);
+                $users[] = '<li>'.get_string('check_riskadmin_unassign', 'report_security', $a).'</li>';
             }
             $rs->close();
             $users = '<ul>'.implode($users).'</ul>';

diff --git a/lang/en_utf8/report_security.php b/lang/en_utf8/report_security.php
index 9e9b7c96ab379516e4ddbe37f9dcf52b45638233..b6206f8e1133633ba68fdff5c0a1840666cc2c38 100644 (file)
--- a/lang/en_utf8/report_security.php
+++ b/lang/en_utf8/report_security.php
@@ -124,6 +124,7 @@ $string['check_riskadmin_detailswarning'] = '<p>Please verify the following list
 <p>It is recommended to assign administrator role in system context only. Following users have unsupported admin role assignments:</p>$a->unsupported';
 $string['check_riskadmin_name'] = 'Administrators';
 $string['check_riskadmin_ok'] = 'Found $a server administrator(s).';
+$string['check_riskadmin_unassign'] = '<a href=\"$a->url\">$a->fullname ($a->email) review role assignment</a>';
 $string['check_riskadmin_warning'] = 'Found $a->admincount server administrators and $a->unsupcount unsupported admin role assignments.';
 
 $string['check_riskxss_details'] = '<p>RISK_XSS denotes all dangerous capabilities that only trusted users may use.</p>