From d6c4544d6351d97c228fb184769fb0901aa7fd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Wed, 26 Jun 2013 22:45:09 +0200 Subject: [PATCH] MDL-40337 cleanup admin select UI --- admin/roles/admins.php | 33 +++++++++---------- .../classes/admins_existing_selector.php | 11 ++++--- .../classes/admins_potential_selector.php | 11 ++++--- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/admin/roles/admins.php b/admin/roles/admins.php index 79f44412328..ec58e050d1f 100644 --- a/admin/roles/admins.php +++ b/admin/roles/admins.php @@ -15,14 +15,14 @@ // along with Moodle. If not, see . /** - * Lets you site administrators + * Select site administrators. * * @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(__DIR__ . '/../../config.php'); require_once($CFG->libdir.'/adminlib.php'); $confirmadd = optional_param('confirmadd', 0, PARAM_INT); @@ -46,7 +46,8 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { $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; } @@ -55,11 +56,12 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { 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; } @@ -70,7 +72,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { $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; @@ -87,7 +89,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { } 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; @@ -99,7 +101,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { } 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; @@ -110,12 +112,12 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { redirect($PAGE->url); } -/// Print header +// Print header. echo $OUTPUT->header(); ?>
-

+

@@ -125,18 +127,18 @@ echo $OUTPUT->header();

- +

display(); ?> - +


- +

- +

@@ -150,7 +152,4 @@ echo $OUTPUT->header(); requires->js_function_call('init_add_remove_admis_page'); - echo $OUTPUT->footer(); diff --git a/admin/roles/classes/admins_existing_selector.php b/admin/roles/classes/admins_existing_selector.php index 111ee6edf8e..93899198ee0 100644 --- a/admin/roles/classes/admins_existing_selector.php +++ b/admin/roles/classes/admins_existing_selector.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Library code used by the roles administration interfaces. + * Existing admin user selector. * * @package core_role * @copyright 2010 Petr Skoda {@link http://skodak.org} @@ -28,6 +28,8 @@ require_once($CFG->dirroot.'/user/selector/lib.php'); class core_role_admins_existing_selector extends user_selector_base { /** + * Create instance. + * * @param string $name control name * @param array $options should have two elements with keys groupid and courseid. */ @@ -44,7 +46,6 @@ class core_role_admins_existing_selector extends user_selector_base { list($wherecondition, $params) = $this->search_sql($search, ''); $fields = 'SELECT ' . $this->required_fields_sql(''); - $countfields = 'SELECT COUNT(1)'; if ($wherecondition) { $wherecondition = "$wherecondition AND id IN ($CFG->siteadmins)"; @@ -73,14 +74,14 @@ class core_role_admins_existing_selector extends user_selector_base { $result = array(); if ($mainadmin) { - $result[get_string('mainadmin', 'role')] = $mainadmin; + $result[get_string('mainadmin', 'core_role')] = $mainadmin; } if ($availableusers) { if ($search) { - $groupname = get_string('extusersmatching', 'role', $search); + $groupname = get_string('extusersmatching', 'core_role', $search); } else { - $groupname = get_string('extusers', 'role'); + $groupname = get_string('extusers', 'core_role'); } $result[$groupname] = $availableusers; } diff --git a/admin/roles/classes/admins_potential_selector.php b/admin/roles/classes/admins_potential_selector.php index b020d1421b6..f80295daddf 100644 --- a/admin/roles/classes/admins_potential_selector.php +++ b/admin/roles/classes/admins_potential_selector.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Library code used by the roles administration interfaces. + * Potential admin user selector. * * @package core_role * @copyright 2010 Petr Skoda {@link http://skodak.org} @@ -28,6 +28,8 @@ require_once($CFG->dirroot.'/user/selector/lib.php'); class core_role_admins_potential_selector extends user_selector_base { /** + * Create instance. + * * @param string $name control name * @param array $options should have two elements with keys groupid and courseid. */ @@ -51,7 +53,8 @@ class core_role_admins_potential_selector extends user_selector_base { $sql = " FROM {user} WHERE $wherecondition AND mnethostid = :localmnet"; - $params['localmnet'] = $CFG->mnet_localhost_id; // it could be dangerous to make remote users admins and also this could lead to other problems + // It could be dangerous to make remote users admins and also this could lead to other problems. + $params['localmnet'] = $CFG->mnet_localhost_id; list($sort, $sortparams) = users_order_by_sql('', $search, $this->accesscontext); $order = ' ORDER BY ' . $sort; @@ -71,9 +74,9 @@ class core_role_admins_potential_selector extends user_selector_base { } if ($search) { - $groupname = get_string('potusersmatching', 'role', $search); + $groupname = get_string('potusersmatching', 'core_role', $search); } else { - $groupname = get_string('potusers', 'role'); + $groupname = get_string('potusers', 'core_role'); } return array($groupname => $availableusers);