mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

relacing deprecated functions with capability checks

Browse Source
This commit is contained in:
toyomoyo 2006-09-19 14:16:40 +00:00
parent 0dde27bb52
commit 9ce384ba1e
10 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/edit.html
View File

@ -413,7 +413,7 @@
helpbutton("metacourse", get_string("metacourse"));?>
</td>
</tr>
<?php if (isadmin() && ((!empty($course->requested) && $CFG->restrictmodulesfor == 'requested') || $CFG->restrictmodulesfor == 'all')) { ?>
<?php if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) && ((!empty($course->requested) && $CFG->restrictmodulesfor == 'requested') || $CFG->restrictmodulesfor == 'all')) { ?>
<tr valign="top">
<td align="right"><?php print_string("restrictmodules") ?>:</td>
<td valign="top"><table cellpadding="0" border="0"><tr valign="top"><td>

5
enrol/imsenterprise/importnow.php
View File

@ -1,15 +1,12 @@
<?php
require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
require_login();
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
if (!$site = get_site()) {
redirect("index.php");
}
if (!isadmin()) {
error("Only the admin can use this page");
}
/// get language strings
$str = get_strings(array('enrolments', 'users', 'administration', 'settings'));

2
lib/questionlib.php
View File

@ -1481,7 +1481,7 @@ function question_category_select_menu($courseid, $published = false, $only_edit
if ($cid==$selected) {
$seltxt = "selected=\"selected\"";
}
if ((!$only_editable) || isteacheredit($category->course)) {
if ((!$only_editable) || has_capability('moodle/question:managecateory', get_context_instance(CONTEXT_COURSE, $category->course))) {
echo " <option value=\"$cid\" $seltxt>$cname</option>\n";
}
}

10
mod/hotpot/index.php
View File

@ -81,7 +81,7 @@
}
$hotpotids = implode(',', $hotpotids);
if (isadmin()) {
if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
// get regrade settings, if any
$regrade = optional_param("regrade");
@ -248,7 +248,7 @@
$select .= " AND a.userid='$USER->id'";
}
$usejoin = 1;
if (isadmin() && $usejoin) {
if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && $usejoin) {
// join attempts table and details table
$tables .= ",{$CFG->prefix}hotpot_details AS d";
$fields .= ',COUNT(DISTINCT d.id) AS detailcount';
@ -259,7 +259,7 @@
}
$totals = get_records_sql("SELECT $fields FROM $tables WHERE $select GROUP BY a.hotpot");
if (isadmin() && empty($usejoin)) {
if (ihas_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && empty($usejoin)) {
foreach ($hotpots as $hotpot) {
$totals[$hotpot->id]->detailcount = 0;
if ($ids = get_records('hotpot_attempts', 'hotpot', $hotpot->id)) {
@ -368,7 +368,7 @@
}
}
if (isadmin()) {
if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if (in_array($hotpot->id, $regradehotpots)) {
$report .= ' <font color="red">'.$strregraderequired.'</font>';
}
@ -393,7 +393,7 @@
array_push($data, $quizname, $quizclose, $bestscore, $report);
if (isadmin()) {
if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if (empty($totals[$hotpot->id]->detailcount)) {
// no details records for this hotpot, so disable regrade
$regradebutton = '&nbsp;';

3
mod/hotpot/mod.html
View File

@ -120,8 +120,7 @@ $text_source_options = array(
</td>
<td align="left"><?PHP
if (isadmin()) {
if (has_capability('moodle/course:managefiles', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$site = get_site();
if ($course->id==$site->id) {
$id = $site->id;

4
mod/hotpot/report.php
View File

@ -48,7 +48,7 @@
// assemble array of form data
$formdata = array(
'mode' => $mode,
'reportcourse' => isadmin() ? optional_param('reportcourse', get_user_preferences('hotpot_reportcourse', 'this')) : 'this',
'reportcourse' => has_capability('mod/hotpot:viewreport', get_context_instance(CONTEXT_SYSTEM, SITEID)) ? optional_param('reportcourse', get_user_preferences('hotpot_reportcourse', 'this')) : 'this',
'reportusers' => has_capability('mod/hotpot:viewreport',$context) ? optional_param('reportusers', get_user_preferences('hotpot_reportusers', 'all')) : 'this',
'reportattempts' => optional_param('reportattempts', get_user_preferences('hotpot_reportattempts', 'all')),
'reportformat' => optional_param('reportformat', 'htm'),
@ -457,7 +457,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
$menus['mode'][$name] = get_string("report$name", $module);
}
}
if (isadmin()) {
if (has_capability('mod/hotpot:viewreport', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$menus['reportcourse'] = array(
'this' => get_string('thiscourse', 'hotpot'), // $course->shortname,
'all' => get_string('allmycourses', 'hotpot')

2
mod/hotpot/show.php
View File

@ -12,7 +12,7 @@
if (!has_capability('mod/hotpot:viewreport',get_context_instance(CONTEXT_COURSE, $params->course))) {
error("You are not allowed to view this page!");
}
if (isadmin()) {
if (has_capability('mod/hotpot:viewreport', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$params->location = optional_param('location', HOTPOT_LOCATION_COURSEFILES);
} else {
$params->location = HOTPOT_LOCATION_COURSEFILES;

5
mod/resource/type/ims/resource.class.php
View File

@ -184,7 +184,8 @@ class resource_ims extends resource_base {
/// If teacheredit, make, hash check. It's the md5 of the name of the file
/// plus its size and modification date
if (isteacheredit($course->id)) {
/// not sure if this capability is suitable
if (has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (!$this->checkpackagehash($file, $course, $resource)) {
return 4;
}
@ -360,7 +361,7 @@ class resource_ims extends resource_base {
print_simple_box_start('center', '60%');
echo '<p align="center">'.$errortext.'</p>';
/// If errors were 3 or 4 and isteacheredit(), show the deploy button
if (isteacheredit($course->id) && ($errorcode == 3 || $errorcode == 4)) {
if (has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $course->id)) && ($errorcode == 3 || $errorcode == 4)) {
$link = 'type/ims/deploy.php';
$options['courseid'] = $course->id;
$options['cmid'] = $cm->id;

2
theme/chameleon/ui/chameleon.php
View File

@ -7,7 +7,7 @@ if (isset($THEME->chameleonenabled) && $THEME->chameleonenabled) {
if (isset($course->id)) {
$chameleon_courseparam = '?id=' . $course->id;
if (!$chameleon_isadmin) {
$chameleon_isteacher = (isteacheredit($course->id) && isset($CFG->coursetheme));
$chameleon_isteacher = (has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id)) && isset($CFG->coursetheme));
}
} else {
$chameleon_courseparam = '';

2
theme/chameleon/ui/css.php
View File

@ -11,7 +11,7 @@ if (empty($THEME->chameleonenabled)) {
$chameleon_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
if ($chameleon_id != 0 && !empty($CFG->allowcoursethemes) && !empty($THEME->chameleonteachereditenabled)) {
if (!isteacheredit($chameleon_id)) {
if (!has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $chameleon_id))) {
die('CHAMELEON_ERROR Either you are not logged in or you are not allowed to edit this theme');
}
} else if (!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {