From ff64aaeaecea187039952f3f111a7b8cee873a67 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 17 Sep 2006 07:00:47 +0000
Subject: [PATCH] Just tidying a couple of functions

---
 lib/accesslib.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 7c5bb6a843..3f424fa502 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2288,45 +2288,49 @@ function allow_override($sroleid, $troleid) {
  * @return int - id or false
  */
 function allow_assign($sroleid, $troleid) {
+    $record = new object;
     $record->roleid = $sroleid;
     $record->allowassign = $troleid;
     return insert_record('role_allow_assign', $record);
 }
 
 /**
- * gets a list of roles assignalbe in this context for this user
+ * Gets a list of roles that this user can assign in this context
  * @param object $context
  * @return array
  */
 function get_assignable_roles ($context) {
 
-    $role = get_records('role');
     $options = array();
-    foreach ($role as $rolex) {
-        if (user_can_assign($context, $rolex->id)) {
-            $options[$rolex->id] = $rolex->name;
+
+    if ($roles = get_records('role')) {
+        foreach ($roles as $role) {
+            if (user_can_assign($context, $role->id)) {
+                $options[$role->id] = $role->name;
+            }
         }
     }
     return $options;
 }
 
 /**
- * gets a list of roles that can be overriden in this context by this user
+ * Gets a list of roles that this user can override in this context
  * @param object $context
  * @return array
  */
 function get_overridable_roles ($context) {
 
-    $role = get_records('role');
     $options = array();
-    foreach ($role as $rolex) {
-        if (user_can_override($context, $rolex->id)) {
-            $options[$rolex->id] = $rolex->name;
+
+    if ($roles = get_records('role')) {
+        foreach ($roles as $role) {
+            if (user_can_override($context, $role->id)) {
+                $options[$role->id] = $role->name;
+            }
         }
-    } 
+    }
     
     return $options;  
-  
 }
 
 
-- 
2.39.5