Skip to content

Commit

Permalink
MDL-17982 Security overview report backported to 1.9 uses 2.0 API
Browse files Browse the repository at this point in the history
Fixes:
- admin/roles/manage.php instead of new admin/roles/define.php
- results returned by old get_recordset_sql() must be iterated using rs_fetch_next_record() instead of new foreach()
  • Loading branch information
mudrd8mz committed Jan 21, 2009
1 parent 3a281e4 commit 3b8a200
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions admin/report/security/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ function report_security_check_defaultcourserole($detailed=false) {
if ($anything_contexts = get_records_sql($sql)) {
foreach($anything_contexts as $contextid) {
if ($contextid == SYSCONTEXTID) {
$a = "$CFG->wwwroot/$CFG->admin/roles/define.php?action=view&roleid=$CFG->defaultcourseroleid";
$a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&roleid=$CFG->defaultcourseroleid";
} else {
$a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&roleid=$CFG->defaultcourseroleid";
}
Expand All @@ -778,7 +778,7 @@ function report_security_check_defaultcourserole($detailed=false) {
if ($riskycontexts = get_records_sql($sql)) {
foreach($riskycontexts as $contextid=>$unused) {
if ($contextid == SYSCONTEXTID) {
$a = "$CFG->wwwroot/$CFG->admin/roles/define.php?action=view&roleid=$CFG->defaultcourseroleid";
$a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&roleid=$CFG->defaultcourseroleid";
} else {
$a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&roleid=$CFG->defaultcourseroleid";
}
Expand Down Expand Up @@ -865,11 +865,11 @@ function report_security_check_courserole($detailed=false) {
ORDER BY rc.roleid, rc.contextid";

$rs = get_recordset_sql($sql);
foreach($rs as $res) {
while ($res = rs_fetch_next_record($rs)) {
$roleid = $res->roleid;
$contextid = $res->contextid;
if ($contextid == SYSCONTEXTID) {
$a = "$CFG->wwwroot/$CFG->admin/roles/define.php?action=view&roleid=$roleid";
$a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&roleid=$roleid";
} else {
$a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&roleid=$roleid";
}
Expand All @@ -888,11 +888,11 @@ function report_security_check_courserole($detailed=false) {
GROUP BY rc.roleid, rc.contextid
ORDER BY rc.roleid, rc.contextid";
$rs = get_recordset_sql($sql);
foreach($rs as $res) {
while ($res = rs_fetch_next_record($rs)) {
$roleid = $res->roleid;
$contextid = $res->contextid;
if ($contextid == SYSCONTEXTID) {
$a = "$CFG->wwwroot/$CFG->admin/roles/define.php?action=view&roleid=$roleid";
$a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&roleid=$roleid";
} else {
$a = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid&roleid=$roleid";
}
Expand All @@ -909,7 +909,7 @@ function report_security_check_courserole($detailed=false) {
AND rc.roleid IN ($inroles)";
if ($legacys = get_records_sql($sql)) {
foreach ($legacys as $roleid=>$unused) {
$a = "$CFG->wwwroot/$CFG->admin/roles/define.php?action=view&roleid=$roleid";
$a = "$CFG->wwwroot/$CFG->admin/roles/manage.php?action=view&roleid=$roleid";
$problems[] = get_string('check_defaultcourserole_legacy', 'report_security', $a);
}
}
Expand Down

0 comments on commit 3b8a200

Please sign in to comment.