Merge branch 'w27_MDL-40337_m26_rolescleanup' of https://github.com/s…

…kodak/moodle
Mrmoodle · Jul 2, 2013 · 6f3c780 · 6f3c780
2 parents 1e031a4 + 1415127
commit 6f3c780
Show file tree

Hide file tree

Showing 33 changed files with 3,250 additions and 2,767 deletions.
diff --git a/admin/roles/admins.php b/admin/roles/admins.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,16 +15,15 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Lets you site administrators
+ * Select site administrators.
  *
- * @package    core
- * @subpackage role
- * @copyright  2010 Petr Skoda (skodak) http://skodak.org
+ * @package    core_role
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require_once(dirname(__FILE__) . '/../../config.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
+require_once(__DIR__ . '/../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
 
 $confirmadd = optional_param('confirmadd', 0, PARAM_INT);
 $confirmdel = optional_param('confirmdel', 0, PARAM_INT);
@@ -37,18 +35,19 @@
     die;
 }
 
-$admisselector = new admins_existing_selector();
+$admisselector = new core_role_admins_existing_selector();
 $admisselector->set_extra_fields(array('username', 'email'));
 
-$potentialadmisselector = new admins_potential_selector();
+$potentialadmisselector = new core_role_admins_potential_selector();
 $potentialadmisselector->set_extra_fields(array('username', 'email'));
 
 if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
     if ($userstoadd = $potentialadmisselector->get_selected_users()) {
         $user = reset($userstoadd);
         $username = fullname($user) . " ($user->username, $user->email)";
         echo $OUTPUT->header();
-        echo $OUTPUT->confirm(get_string('confirmaddadmin', 'role', $username), new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey())), $PAGE->url);
+        $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey()));
+        echo $OUTPUT->confirm(get_string('confirmaddadmin', 'core_role', $username), $yesurl, $PAGE->url);
         echo $OUTPUT->footer();
         die;
     }
@@ -57,11 +56,12 @@
     if ($userstoremove = $admisselector->get_selected_users()) {
         $user = reset($userstoremove);
         if ($USER->id == $user->id) {
-            //can not remove self
+            // Can not remove self.
         } else {
             $username = fullname($user) . " ($user->username, $user->email)";
             echo $OUTPUT->header();
-            echo $OUTPUT->confirm(get_string('confirmdeladmin', 'role', $username), new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey())), $PAGE->url);
+            $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey()));
+            echo $OUTPUT->confirm(get_string('confirmdeladmin', 'core_role', $username), $yesurl, $PAGE->url);
             echo $OUTPUT->footer();
             die;
         }
@@ -72,7 +72,7 @@
         $newmain = reset($newmain);
         $newmain = $newmain->id;
         $admins = array();
-        foreach(explode(',', $CFG->siteadmins) as $admin) {
+        foreach (explode(',', $CFG->siteadmins) as $admin) {
             $admin = (int)$admin;
             if ($admin) {
                 $admins[$admin] = $admin;
@@ -89,7 +89,7 @@
 
 } else if ($confirmadd and confirm_sesskey()) {
     $admins = array();
-    foreach(explode(',', $CFG->siteadmins) as $admin) {
+    foreach (explode(',', $CFG->siteadmins) as $admin) {
         $admin = (int)$admin;
         if ($admin) {
             $admins[$admin] = $admin;
@@ -101,7 +101,7 @@
 
 } else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
     $admins = array();
-    foreach(explode(',', $CFG->siteadmins) as $admin) {
+    foreach (explode(',', $CFG->siteadmins) as $admin) {
         $admin = (int)$admin;
         if ($admin) {
             $admins[$admin] = $admin;
@@ -112,12 +112,12 @@
     redirect($PAGE->url);
 }
 
-/// Print header
+// Print header.
 echo $OUTPUT->header();
 ?>
 
 <div id="addadmisform">
-    <h3 class="main"><?php print_string('manageadmins', 'role'); ?></h3>
+    <h3 class="main"><?php print_string('manageadmins', 'core_role'); ?></h3>
 
     <form id="assignform" method="post" action="<?php echo $PAGE->url ?>">
     <div>
@@ -127,18 +127,18 @@
     <tr>
       <td id='existingcell'>
           <p>
-            <label for="removeselect"><?php print_string('existingadmins', 'role'); ?></label>
+            <label for="removeselect"><?php print_string('existingadmins', 'core_role'); ?></label>
           </p>
           <?php $admisselector->display(); ?>
           </td>
-      <td id='buttonscell'>
+      <td id="buttonscell">
         <p class="arrow_button">
             <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
             <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
-            <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'role'); ?>" title="<?php print_string('mainadminset', 'role'); ?>" />
+            <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'core_role'); ?>" title="<?php print_string('mainadminset', 'core_role'); ?>" />
         </p>
       </td>
-      <td id='potentialcell'>
+      <td id="potentialcell">
           <p>
             <label for="addselect"><?php print_string('users'); ?></label>
           </p>
@@ -152,7 +152,4 @@
 
 <?php
 
-//this must be after calling display() on the selectors so their setup JS executes first
-//////$PAGE->requires->js_function_call('init_add_remove_admis_page');
-
 echo $OUTPUT->footer();
diff --git a/admin/roles/allow.php b/admin/roles/allow.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,23 +15,21 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Allow overriding of roles by other roles
+ * Allow overriding of roles by other roles.
  *
- * @package    core
- * @subpackage role
+ * @package    core_role
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once(dirname(__FILE__) . '/../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
 
 $mode = required_param('mode', PARAM_ALPHANUMEXT);
 $classformode = array(
-    'assign' => 'role_allow_assign_page',
-    'override' => 'role_allow_override_page',
-    'switch' => 'role_allow_switch_page'
+    'assign' => 'core_role_allow_assign_page',
+    'override' => 'core_role_allow_override_page',
+    'switch' => 'core_role_allow_switch_page'
 );
 if (!isset($classformode[$mode])) {
     print_error('invalidmode', '', '', $mode);
@@ -48,7 +45,7 @@
 
 if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
     $controller->process_submission();
-    mark_context_dirty($syscontext->path);
+    $syscontext->mark_dirty();
     add_to_log(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl), '', '', $USER->id);
     redirect($baseurl);
 }