Changes to string format for capabilities

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 3094315da99b8ecf6ca53ca55f0d9b3b7c55ba70..c07d65e4ef735777935353d7675c70c79469dff4 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -49,7 +49,7 @@
             ?>
                 
             <tr>
-              <td><?php echo get_capability_string($capability->name); ?></td>
+              <td><span title="<?php echo $capability->name ?>"><?php echo get_capability_string($capability->name); ?></span></td>
                  <td><INPUT TYPE=radio NAME="<?php echo $capability->name; ?>" VALUE="0" <?php if (!isset($localoverride->permission) || $localoverride->permission==0){ echo 'checked="checked"'; }?>></td>
                  <td><INPUT TYPE=radio NAME="<?php echo $capability->name; ?>" VALUE="1" <?php if (isset($localoverride->permission) && $localoverride->permission==1){ echo 'checked="checked"'; }?>></td>
                  <td ><INPUT TYPE=radio NAME="<?php echo $capability->name; ?>" VALUE="-1" <?php if (isset($localoverride->permission) && $localoverride->permission==-1){ echo 'checked="checked"'; }?>></td>

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 151ef3a78c1920fe1841ce1a24f086667e056d1d..66cf57bdda9c238fce02b07cd4616d0a38c79c2b 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1429,38 +1429,39 @@ function get_role_context_capability($contextid, $capability, $capabilities) {
 
 
 // a big switch statement
-function get_capability_string($capname) {
+function get_capability_string($capabilityname) {
 
-    $names = split('/', $capname);
-    $componentname = split(':', $names[1]);
-    $componentname = $componentname[0];
-    $capability = split(':', $capname);
-    $capability = 'capability_'.$capability[1];
+    // Typical capabilityname is:   mod/choice:readresponses
+
+    $names = split('/', $capabilityname);
+    $stringname = $names[1];                 // choice:readresponses
+    $components = split(':', $stringname);   
+    $componentname = $components[0];               // choice
 
     switch ($names[0]) {
         case 'mod':
-            $string = get_string($capability, $componentname);
+            $string = get_string($stringname, $componentname);
         break;
         
         case 'block':
-            $string = get_string($capability, 'block_'.$componentname);
+            $string = get_string($stringname, 'block_'.$componentname);
         break;
-        
+
         case 'moodle':
-            $string = get_string($capability);
+            $string = get_string($stringname, 'role');
         break;
         
         case 'enrol':
-            $string = get_string($capability, 'enrol_'.$componentname);
+            $string = get_string($stringname, 'enrol_'.$componentname);
+        break;  
         
         default:
-            $string = get_string($capability);
+            $string = get_string($stringname);
         break;  
-            
       
     }
 
-      return $string;
+    return $string;
 }
 
 
@@ -1470,7 +1471,7 @@ function get_component_string($component, $contextlevel) {
     switch ($contextlevel) {
 
         case CONTEXT_SYSTEM:
-            $string = get_string('system');
+            $string = get_string('coresystem');
         break;
 
         case CONTEXT_PERSONAL:
@@ -1510,4 +1511,4 @@ function get_component_string($component, $contextlevel) {
     return $string;
   
 }
-?>
\ No newline at end of file
+?>