mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 13:33:52 +02:00
Code Issues Projects Releases Wiki Activity

some (mainly admin realated) capabilities

Browse Source
This commit is contained in:
toyomoyo 2006-08-25 08:27:27 +00:00
parent fd57975491
commit 41d7209c7f
37 changed files with 92 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/admin.php
View File

@ -1,6 +1,8 @@
<?PHP // $Id$
// Admin-only script to assign administrative rights to users
/// this file is depreciated, assigning of admin is done in admin/roles/assign.php
require_once('../config.php');
define("MAX_USERS_PER_PAGE", 50);
@ -11,9 +13,7 @@
require_login();
if (!isadmin()) {
error("You must be an administrator to use this page.");
}
require_capability('moodle/user:assign', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!confirm_sesskey()) {
error(get_string('confirmsesskeybad', 'error'));

4
admin/backup.php
View File

@ -7,9 +7,7 @@
require_login();
if (!isadmin()) {
error("Only an admin can use this page");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
error("Site isn't defined!");

4
admin/calendar.php
View File

@ -6,9 +6,7 @@
require_login();
if (!isadmin()) {
error('Only administrators can use this page!');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
error('Site isn\'t defined!');

5
admin/config.php
View File

@ -7,10 +7,7 @@
if ($site = get_site()) { // If false then this is a new installation
require_login();
$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
if (!has_capability('moodle/site:config', $context)) {
error('Only the admin can use this page');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
}
/// This is to overcome the "insecure forms paradox"

15
admin/courses.php
View File

@ -4,16 +4,13 @@
require_login();
if (!isadmin()) {
error("Only admins can access this page");
}
if (!$site = get_site()) {
redirect("index.php");
}
$stradministration = get_string("administration");
$strcourses = get_string("courses");
$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
print_header("$site->shortname: $stradministration: $strcourses", "$site->fullname",
"<a href=\"index.php\">$stradministration</a> -> $strcourses");
@ -26,14 +23,8 @@
get_string("adminhelpcourses"));
$table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
get_string("adminhelpenrolments"));
$table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
get_string("adminhelpassignstudents"));
$table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
$table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
get_string("adminhelpassigncreators"));
$table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
get_string("adminhelpassignadmins"));
$table->data[] = array('<b><a href="roles/assign.php?contextid='.$context->id.'">'.
get_string('assignsiteroles').'</a></b>', get_string('adminhelpassignsiteroles'));
print_table($table);

8
admin/creators.php
View File

@ -1,6 +1,8 @@
<?PHP // $Id$
// Admin only script to assign course creator rights to users
/// this file is depreciated, assigning of course creators is done in admin/roles/assign.php
require_once('../config.php');
define("MAX_USERS_PER_PAGE", 50);
@ -11,9 +13,7 @@
require_login();
if (!isadmin()) {
error("You must be an administrator to use this page.");
}
require_capability('moodle/user:assign', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!confirm_sesskey()) {
error(get_string('confirmsesskeybad', 'error'));

2
admin/cron.php
View File

@ -29,7 +29,7 @@
require_once(dirname(__FILE__) . '/../config.php');
require_once($CFG->dirroot.'/lib/adminlib.php');
if (!$alreadyadmin = isadmin()) {
if (!$alreadyadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
unset($_SESSION['USER']);
unset($USER);
unset($_SESSION['SESSION']);

4
admin/dbperformance.php
View File

@ -9,9 +9,7 @@
require_login();
if (!isadmin()) {
error("Only the admin can use this page");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
$strdatabaseperformance = get_string("databaseperformance");
$stradministration = get_string("administration");

4
admin/delete.php
View File

@ -10,9 +10,7 @@
$sure = optional_param('sure', 0, PARAM_BOOL);
$reallysure = optional_param('reallysure', 0, PARAM_BOOL);
if (!isadmin()) {
error('You must be admin to use this script!');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
$deletedir = $CFG->dataroot; // The directory to delete!

5
admin/editor.php
View File

@ -7,9 +7,8 @@
require_login();
if (!isadmin()) {
error("Only admins can access this page");
}
$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
require_capability('moodle/site:config', $context);
if (($data = data_submitted()) && confirm_sesskey()) {

4
admin/health.php
View File

@ -20,9 +20,7 @@
$solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
require_login();
if (!isadmin()) {
error('Only the admin can use this page');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
$site = get_site();
$stradmin = get_string('administration');

4
admin/innodb.php
View File

@ -6,9 +6,7 @@
require_login();
if (!isadmin()) {
error('Admin only');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
print_header("Convert all tables from MYISAM to InnoDB", "Convert all tables from MYISAM to InnoDB",
"Convert all tables from MYISAM to InnoDB");

23
admin/misc.php
View File

@ -4,13 +4,11 @@
require_login();
if (!isadmin()) {
error("Only admins can access this page");
}
if (!$site = get_site()) {
redirect("index.php");
}
$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
$stradministration = get_string("administration");
$strmisc = get_string("miscellaneous");
@ -26,14 +24,21 @@
get_string("adminhelpsitefiles"));
$table->data[] = array('<b><a href="stickyblocks.php">'.get_string('stickyblocks','admin')."</a></b>",
get_string('adminhelpstickyblocks'));
$table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
get_string('adminhelpreports'));
if (has_capability('moodle/site:viewreports', $context)) {
$table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
get_string('adminhelpreports'));
}
// to be enabled later
/* $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
get_string('adminhelphealthcenter'));*/
$table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
get_string('adminhelpenvironment'));
if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
if (has_capability('moodle/site:config', $context)) {
$table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
get_string('adminhelpenvironment'));
}
if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype") && has_capability('moodle/site:accessdb', $context)) {
$table->data[] = array('<b><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase')."</a></b>",
get_string('adminhelpmanagedatabase'));
}

7
admin/oacleanup.php
View File

@ -6,11 +6,8 @@ if (!isset($CFG)) {
require_login();
if (!isadmin()) {
error('You must be an admin to use this script');
exit;
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
print_header_simple('Online Assignment Cleanup','Online Assignment Cleanup', 'Admin');
online_assignment_cleanup(true);

2
admin/pagelib.php
View File

@ -45,7 +45,7 @@ class page_admin extends page_base {
// seems reasonable that the only people that can edit blocks on the admin pages
// are the admins... but maybe we want a role for this?
function user_allowed_editing() {
return isadmin();
return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
}
// has to be fixed. i know there's a "proper" way to do this

4
admin/phpinfo.php
View File

@ -8,9 +8,7 @@
require_login();
if (!isadmin()) {
error("Only the admin can use this page");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$topframe && !$bottomframe) {
?>

4
admin/register.php
View File

@ -5,9 +5,7 @@
require_login();
if (!isadmin()) {
error("Only the admin can use this page");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
redirect("index.php");

4
admin/replace.php
View File

@ -8,9 +8,7 @@ $replace = optional_param('replace', '', PARAM_RAW);
require_login();
if (!isadmin()) {
error("Admins only");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
###################################################################
print_header('Search and replace throughout the whole database', 'Replace text within the whole database');

4
admin/report.php
View File

@ -3,9 +3,7 @@
require_once('../config.php');
if (!isadmin()) {
error("You are not allowed to look at this page");
}
require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
$stradmin = get_string('administration');
$strreports = get_string('reports');

4
admin/report/courseoverview/index.php
View File

@ -13,9 +13,7 @@
require_login();
if (!isadmin()) {
error("This page is for admins only");
}
require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
$course = get_site();
stats_check_uptodate($course->id);

6
admin/report/courseoverview/reportsgraph.php
View File

@ -10,10 +10,8 @@
require_login();
if (!isadmin()) {
error("You must be an admin to use this page");
}
require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
stats_check_uptodate($course->id);
$param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);

5
admin/report/simpletest/index.php
View File

@ -21,10 +21,7 @@ define('UNITTEST', true);
$langfile = 'simpletest';
require_login();
if (!isadmin()) {
print_error('Only admins can access this page');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
// CGI arguments
$path = optional_param('path', '', PARAM_PATH);
$showpasses = optional_param('showpasses', false, PARAM_BOOL);

8
admin/roles/manage.php
View File

@ -15,14 +15,6 @@
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
// if (!isadmin()) {
// error('Only admins can access this page');
// }
// if (!$site = get_site()) {
// redirect('index.php');
// }
$stradministration = get_string('administration');
$strmanageroles = get_string('manageroles');

4
admin/site.php
View File

@ -5,9 +5,7 @@
if ($site = get_site()) {
require_login();
if (!isadmin()) {
error("You need to be admin to edit this page");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
$site->format = "social"; // override
}

4
admin/stickyblocks.php
View File

@ -24,9 +24,7 @@
require_login();
if (!isadmin()) {
error("Only the admin can use this page");
}
require_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
// first thing to do is print the dropdown menu

4
admin/timezone.php
View File

@ -6,9 +6,7 @@
require_login();
if (!isadmin()) {
error("You must be an admin");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
$strtimezone = get_string("timezone");
$strsavechanges = get_string("savechanges");

8
admin/upgradeforumread.php
View File

@ -7,11 +7,9 @@
$confirm = optional_param('confirm', 0, PARAM_BOOL);
require_login();
if (!isadmin()) {
error("You must be an admin to use this script");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if ($CFG->version < 2005042300) {
error("This script does not work with this old version of Moodle");
}

4
admin/upgradelogs.php
View File

@ -6,9 +6,7 @@
require_login();
if (!isadmin()) {
error("You must be an admin to use this script");
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if ($CFG->version < 2004013101) {
error("This script does not work with this old version of Moodle");

4
admin/uploaduser.php
View File

@ -12,9 +12,7 @@ $allowrenames = optional_param('allowrenames', 0, PARAM_BOOL);
require_login();
if (!isadmin()) {
error("You must be an administrator to edit users this way.");
}
require_capability('moodle/user:create', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (! $site = get_site()) {
error("Could not find site-level course");

14
admin/users.php
View File

@ -4,9 +4,7 @@
require_login();
if (!isadmin()) {
error("Only admins can access this page");
}
require_capability('moodle/user:create', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
redirect("index.php");
@ -43,14 +41,8 @@
$table->data[] = array('', '<hr />');
$table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
get_string("adminhelpenrolments"));
$table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
get_string("adminhelpassignstudents"));
$table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
$table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
get_string("adminhelpassigncreators"));
$table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
get_string("adminhelpassignadmins"));
$table->data[]= array('<b><a href="roles/assign.php?contextid='.$context->id.'">'.
get_string('assignsiteroles').'</a></b>', get_string('adminhelpassignsiteroles'));
print_table($table);

4
admin/utfdbmigrate.php
View File

@ -49,9 +49,7 @@
* End custom lang pack handling *
**************************************/
if (!isadmin()) {
error('Only admins can access this page');
}
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
redirect('index.php');

7
course/edit.php
View File

@ -130,10 +130,11 @@
$section->id = insert_record("course_sections", $section);
fix_course_sortorder();
add_to_log(SITEID, "course", "new", "view.php?id=$newcourseid", "$form->fullname (ID $newcourseid)");
add_to_log(SITEID, "course", "new", "view.php?id=$newcourseid", "$form->fullname (ID $newcourseid)") ;
$context = get_context_instance(CONTEXT_COURSE, $newcourseid);
if (isadmin()) { // Redirect admin to add teachers
redirect("teacher.php?id=$newcourseid", get_string("changessaved"));
if (has_capability('moodle/role:assign', $context)) { // Redirect users with assign capability to assign users to different roles
redirect($CFG->wwwroot."/admin/roles/assign.php?contextid=$context->id", get_string("changessaved"));
} else { // Add current teacher and send to course

10
course/scales.php
View File

@ -159,7 +159,7 @@
}
//Check for standard scales
if ($scale->courseid == 0 and !isadmin()) {
if ($scale->courseid == 0 and !has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
error("Only administrators can edit this scale",$CFG->wwwroot.'/course/scales.php?id='.$course->id);
}
@ -254,7 +254,7 @@
}
//Check for standard scales
if ($scale->courseid == 0 and !isadmin()) {
if ($scale->courseid == 0 and !has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
error("Only administrators can delete this scale",$CFG->wwwroot.'/course/scales.php?id='.$course->id);
}
@ -436,14 +436,14 @@
$line[] = $strstandardscale;
}
$buttons = "";
if (empty($scales_uses) && ($incustom || isadmin())) {
if (empty($scales_uses) && ($incustom || has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID)))) {
$buttons .= "<a title=\"$stredit\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=edit\"><img".
" src=\"$CFG->pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
if ($incustom && isadmin()) {
if ($incustom && has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$buttons .= "<a title=\"$strdown\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=down&amp;sesskey=$USER->sesskey\"><img".
" src=\"$CFG->pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
}
if (!$incustom && isadmin()) {
if (!$incustom && has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$buttons .= "<a title=\"$strup\" href=\"$path/scales.php?id=$course->id&amp;scaleid=$scale->id&amp;action=up&amp;sesskey=$USER->sesskey\"><img".
" src=\"$CFG->pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
}

1
lib/accesslib.php
View File

@ -780,7 +780,6 @@ function moodle_install_roles() {
// Should we delete the tables after we are done? Not yet.
}
/**
* Assign the defaults found in this capabality definition to roles that have
* the corresponding legacy capabilities assigned to them.

8
user/edit.html
View File

@ -20,7 +20,7 @@
<form method="post" name="form" enctype="multipart/form-data" action="edit.php">
<table class="formtable">
<?php
if (isadmin()) {
if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$theadmin = get_admin(); // returns false during install
$adminself = (!empty($theadmin) and ($theadmin->id == $USER->id) and ($USER->id == $user->id));
echo '<tr>';
@ -275,7 +275,7 @@ if (isadmin()) {
<?php
$maxbytes = get_max_upload_file_size($CFG->maxbytes, $course->maxbytes);
if (!empty($CFG->gdversion) and $maxbytes and (empty($CFG->disableuserimages) or isadmin())) {
if (!empty($CFG->gdversion) and $maxbytes and (empty($CFG->disableuserimages) or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID)))) {
?>
<tr>
<th><?php print_string("currentpicture") ?>:</th>
@ -300,7 +300,7 @@ if (isadmin()) {
?>
</td>
</tr>
<?php } else if (empty($CFG->gdversion) and isadmin()) { ?>
<?php } else if (empty($CFG->gdversion) and has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { ?>
<tr>
<th><?php print_string("newpicture") ?>:</th>
<td>
@ -356,7 +356,7 @@ if (isadmin()) {
<?php if (isset($err["idnumber"])) formerr($err["idnumber"]); ?>
</td>
</tr>
<?php if (isadmin()) { ?>
<?php if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { ?>
<tr>
<th><?php print_string("institution") ?>:</th>
<td><input type="text" name="institution" size="25" alt="<?php print_string("institution") ?>" maxlength="40" value="<?php p($user->institution) ?>" /> <?php p($teacheronly) ?>

18
user/edit.php
View File

@ -36,7 +36,7 @@
}
if ($USER->id <> $user->id) { // Current user editing someone else's profile
if (isadmin()) { // Current user is an admin
if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // Current user can update user profiles
if ($mainadmin = get_admin()) {
if ($user->id == $mainadmin->id) { // Can't edit primary admin
print_error('adminprimarynoedit');
@ -143,7 +143,7 @@
$usernew->username = moodle_strtolower($usernew->username);
}
if (!empty($_FILES) and !(empty($CFG->disableuserimages) or isadmin())) {
if (!empty($_FILES) and !(empty($CFG->disableuserimages) or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID)))) {
error('Users can not update profile images!');
}
@ -151,7 +151,7 @@
$um = new upload_manager('imagefile',false,false,null,false,0,true,true);
// override locked values
if (!isadmin()) {
if (!has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$fields = get_user_fieldnames();
$authconfig = get_config( 'auth/' . $user->auth );
foreach ($fields as $field) {
@ -197,7 +197,7 @@
$usernew->timemodified = time();
if (isadmin()) {
if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if (!empty($usernew->newpassword)) {
$usernew->password = hash_internal_user_password($usernew->newpassword);
// update external passwords
@ -354,7 +354,7 @@
}
$teacher = strtolower($course->teacher);
if (!isadmin()) {
if (!has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$teacheronly = '('.get_string('teacheronly', '', $teacher).')';
} else {
$teacheronly = '';
@ -362,7 +362,7 @@
include("edit.html");
if (!isadmin()) { /// Lock all the locked fields using Javascript
if (!has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { /// Lock all the locked fields using Javascript
$fields = get_user_fieldnames();
echo '<script type="text/javascript">'."\n";
@ -403,7 +403,7 @@
function find_form_errors(&$user, &$usernew, &$err, &$um) {
global $CFG;
if (isadmin()) {
if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if (empty($usernew->username)) {
$err["username"] = get_string("missingusername");
@ -433,7 +433,7 @@ function find_form_errors(&$user, &$usernew, &$err, &$um) {
if (over_bounce_threshold($user) && $user->email == $usernew->email)
$err['email'] = get_string('toomanybounces');
if (empty($usernew->description) and !isadmin())
if (empty($usernew->description) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID)))
$err["description"] = get_string("missingdescription");
if (empty($usernew->city))
@ -457,7 +457,7 @@ function find_form_errors(&$user, &$usernew, &$err, &$um) {
}
}
if (empty($err["email"]) and !isadmin()) {
if (empty($err["email"]) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if ($error = email_is_not_allowed($usernew->email)) {
$err["email"] = $error;
}

21
user/index.php
View File

@ -42,6 +42,19 @@
require_login($course->id);
if ($roles = get_roles_used_in_context($context)) {
foreach ($roles as $role) {
$options[$role->id] = $role->name;
}
} else { // no roles yet
if (has_capability('moodle/user:assign', $context)) {
redirect($CFG->wwwroot.'/admin/roles/assign.php?contextid='.$context->id);
} else {
error ('no participants found for this course');
}
}
require_capability('moodle/course:viewparticipants', $context);
if (!$course->category) {
@ -147,14 +160,6 @@
/*****************************************
* drop down for swapping between roles *
*****************************************/
// this needs to check capability too
if ($roles = get_roles_used_in_context($context)) {
foreach ($roles as $role) {
$options[$role->id] = $role->name;
}
}
if (!$roleid) {
if ($options) {