From 458453cee0db7280ad16211d0a2b97a4ab5f417f Mon Sep 17 00:00:00 2001 From: Charles YVANES Date: Mon, 10 Sep 2018 10:58:11 +0200 Subject: [PATCH] MDL-29895 core: removed require_login() when not needed --- admin/filters.php | 4 ---- admin/message.php | 3 --- admin/mnet/access_control.php | 2 -- admin/mnet/delete.php | 2 -- admin/mnet/index.php | 2 -- admin/mnet/peers.php | 4 ---- admin/mnet/profilefields.php | 4 ---- admin/mnet/services.php | 3 --- admin/mnet/testclient.php | 4 ---- admin/mnet/trustedhosts.php | 4 ---- admin/portfolio.php | 2 -- admin/qtypes.php | 1 - admin/repository.php | 1 - admin/repositoryinstance.php | 1 - admin/roles/define.php | 1 - admin/roles/manage.php | 1 - admin/tool/dbtransfer/dbexport.php | 1 - admin/tool/dbtransfer/index.php | 1 - admin/tool/health/index.php | 3 --- admin/tool/httpsreplace/index.php | 3 --- admin/tool/httpsreplace/tool.php | 3 --- admin/tool/innodb/index.php | 2 -- admin/tool/log/store/database/test_settings.php | 3 --- admin/tool/monitor/managerules.php | 1 - admin/tool/spamcleaner/index.php | 1 - admin/tool/unsuproles/index.php | 2 -- admin/tool/uploaduser/index.php | 1 - admin/tool/uploaduser/picture.php | 2 -- admin/tool/xmldb/index.php | 2 -- admin/user/user_bulk_confirm.php | 1 - admin/user/user_bulk_delete.php | 1 - admin/user/user_bulk_download.php | 1 - admin/user/user_bulk_forcepasswordchange.php | 1 - admin/user/user_bulk_message.php | 1 - admin/webservice/tokens.php | 1 - auth/test_settings.php | 3 --- comment/index.php | 1 - course/pending.php | 3 --- enrol/test_settings.php | 3 --- grade/edit/letter/index.php | 1 - message/defaultoutputs.php | 3 --- my/indexsys.php | 2 -- report/loglive/index.php | 6 ++---- report/performance/index.php | 1 - report/security/index.php | 1 - user/profilesys.php | 1 - 46 files changed, 2 insertions(+), 93 deletions(-) diff --git a/admin/filters.php b/admin/filters.php index 9ae73f31c37..958fc6e16ca 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -28,10 +28,6 @@ require_once($CFG->libdir . '/adminlib.php'); $action = optional_param('action', '', PARAM_ALPHA); $filterpath = optional_param('filterpath', '', PARAM_PLUGIN); -require_login(); -$systemcontext = context_system::instance(); -require_capability('moodle/site:config', $systemcontext); - admin_externalpage_setup('managefilters'); // Clean up bogus filter states first. diff --git a/admin/message.php b/admin/message.php index 6924e61db30..c10034ae6dd 100644 --- a/admin/message.php +++ b/admin/message.php @@ -28,9 +28,6 @@ require_once($CFG->libdir.'/adminlib.php'); // This is an admin page admin_externalpage_setup('managemessageoutputs'); -// Require site configuration capability -require_capability('moodle/site:config', context_system::instance()); - // Get the submitted params $disable = optional_param('disable', 0, PARAM_INT); $enable = optional_param('enable', 0, PARAM_INT); diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 88abd77dcfc..a1223012b77 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -12,8 +12,6 @@ $page = optional_param('page', 0, PARAM_INT); $perpage = optional_param('perpage', 30, PARAM_INT); $action = trim(strtolower(optional_param('action', '', PARAM_ALPHA))); -require_login(); - admin_externalpage_setup('ssoaccesscontrol'); if (!extension_loaded('openssl')) { diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php index 03eac9bcf13..479d559215a 100644 --- a/admin/mnet/delete.php +++ b/admin/mnet/delete.php @@ -34,10 +34,8 @@ $step = optional_param('step', 'verify', PARAM_ALPHA); $hostid = required_param('hostid', PARAM_INT); -require_login(); $context = context_system::instance(); -require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions"); $mnet = get_mnet_environment(); diff --git a/admin/mnet/index.php b/admin/mnet/index.php index 879caa83b24..fff93869420 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -6,12 +6,10 @@ require_once($CFG->libdir.'/adminlib.php'); include_once($CFG->dirroot.'/mnet/lib.php'); - require_login(); admin_externalpage_setup('net'); $context = context_system::instance(); - require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions"); $site = get_site(); $mnet = get_mnet_environment(); diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php index 559d2f4a2d4..49fd346493a 100644 --- a/admin/mnet/peers.php +++ b/admin/mnet/peers.php @@ -32,10 +32,6 @@ require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->dirroot.'/mnet/lib.php'); require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php'); -require_login(); - -$context = context_system::instance(); -require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions'); /// Initialize variables. $hostid = optional_param('hostid', 0, PARAM_INT); diff --git a/admin/mnet/profilefields.php b/admin/mnet/profilefields.php index a27f162fb0b..88e9004a7b4 100644 --- a/admin/mnet/profilefields.php +++ b/admin/mnet/profilefields.php @@ -29,14 +29,10 @@ require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php'); $mnet = get_mnet_environment(); -require_login(); $hostid = required_param('hostid', PARAM_INT); $mnet_peer = new mnet_peer(); $mnet_peer->set_id($hostid); -$context = context_system::instance(); - -require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions'); admin_externalpage_setup('mnetpeers'); $form = new mnet_profile_form(null, array('hostid' => $hostid)); diff --git a/admin/mnet/services.php b/admin/mnet/services.php index 79e46e9f58c..d5048ebb9ac 100644 --- a/admin/mnet/services.php +++ b/admin/mnet/services.php @@ -30,11 +30,8 @@ require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php'); $mnet = get_mnet_environment(); -require_login(); admin_externalpage_setup('mnetpeers'); -$context = context_system::instance(); -require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions"); $hostid = required_param('hostid', PARAM_INT); diff --git a/admin/mnet/testclient.php b/admin/mnet/testclient.php index 2560e847f6b..a12ebb6b71f 100644 --- a/admin/mnet/testclient.php +++ b/admin/mnet/testclient.php @@ -21,12 +21,8 @@ if ($CFG->mnet_dispatcher_mode === 'off') { print_error('mnetdisabled', 'mnet'); } -require_login(); admin_externalpage_setup('mnettestclient'); -$context = context_system::instance(); -require_capability('moodle/site:config', $context); - error_reporting(DEBUG_ALL); echo $OUTPUT->header(); diff --git a/admin/mnet/trustedhosts.php b/admin/mnet/trustedhosts.php index cbbbfa353cc..5ad348c3b5c 100644 --- a/admin/mnet/trustedhosts.php +++ b/admin/mnet/trustedhosts.php @@ -5,12 +5,8 @@ require_once($CFG->libdir.'/adminlib.php'); include_once($CFG->dirroot.'/mnet/lib.php'); - require_login(); admin_externalpage_setup('trustedhosts'); - $context = context_system::instance(); - - require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions"); if (!extension_loaded('openssl')) { echo $OUTPUT->header(); diff --git a/admin/portfolio.php b/admin/portfolio.php index 6a33fc0eea0..66ff3a71ebf 100644 --- a/admin/portfolio.php +++ b/admin/portfolio.php @@ -35,8 +35,6 @@ if ($action == 'newon') { admin_externalpage_setup($pagename); -require_capability('moodle/site:config', context_system::instance()); - $baseurl = "$CFG->wwwroot/$CFG->admin/portfolio.php"; $sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey(); $configstr = get_string('manageportfolios', 'portfolio'); diff --git a/admin/qtypes.php b/admin/qtypes.php index b13baf074cc..f9dfc2e2b0c 100644 --- a/admin/qtypes.php +++ b/admin/qtypes.php @@ -31,7 +31,6 @@ require_once($CFG->libdir . '/adminlib.php'); require_once($CFG->libdir . '/tablelib.php'); // Check permissions. -require_login(); $systemcontext = context_system::instance(); require_capability('moodle/question:config', $systemcontext); $canviewreports = has_capability('report/questioninstances:view', $systemcontext); diff --git a/admin/repository.php b/admin/repository.php index 6984da60f27..0c7998783a9 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -47,7 +47,6 @@ if ($action == 'newon') { $visible = false; } -require_capability('moodle/site:config', context_system::instance()); admin_externalpage_setup($pagename); $sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey(); diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php index 960d0ff28c0..70202247f98 100644 --- a/admin/repositoryinstance.php +++ b/admin/repositoryinstance.php @@ -42,7 +42,6 @@ if ($edit){ } admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php')); -require_capability('moodle/site:config', $context); $baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey())); diff --git a/admin/roles/define.php b/admin/roles/define.php index de3eac1b1c4..a298052b1c5 100644 --- a/admin/roles/define.php +++ b/admin/roles/define.php @@ -54,7 +54,6 @@ if ($return === 'manage') { // Check access permissions. $systemcontext = context_system::instance(); -require_login(); require_capability('moodle/role:manage', $systemcontext); admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid), new moodle_url('/admin/roles/define.php')); diff --git a/admin/roles/manage.php b/admin/roles/manage.php index fb390eae1c4..e32f39855d5 100644 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -48,7 +48,6 @@ $defineurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/define.php'; // Check access permissions. $systemcontext = context_system::instance(); -require_login(); require_capability('moodle/role:manage', $systemcontext); admin_externalpage_setup('defineroles'); diff --git a/admin/tool/dbtransfer/dbexport.php b/admin/tool/dbtransfer/dbexport.php index f55b29d0312..2bc5e61a6e4 100644 --- a/admin/tool/dbtransfer/dbexport.php +++ b/admin/tool/dbtransfer/dbexport.php @@ -28,7 +28,6 @@ require('../../../config.php'); require_once('locallib.php'); require_once('database_export_form.php'); -require_login(); admin_externalpage_setup('tooldbexport'); // Create form. diff --git a/admin/tool/dbtransfer/index.php b/admin/tool/dbtransfer/index.php index aa8b5b3b581..4423a0abc14 100644 --- a/admin/tool/dbtransfer/index.php +++ b/admin/tool/dbtransfer/index.php @@ -28,7 +28,6 @@ require('../../../config.php'); require_once('locallib.php'); require_once('database_transfer_form.php'); -require_login(); admin_externalpage_setup('tooldbtransfer'); // Create the form. diff --git a/admin/tool/health/index.php b/admin/tool/health/index.php index 1e5b147f36a..54227392ef0 100644 --- a/admin/tool/health/index.php +++ b/admin/tool/health/index.php @@ -39,9 +39,6 @@ $solution = optional_param('solution', 0, PARAM_PLUGIN); - require_login(); - require_capability('moodle/site:config', context_system::instance()); - $site = get_site(); echo $OUTPUT->header(); diff --git a/admin/tool/httpsreplace/index.php b/admin/tool/httpsreplace/index.php index a3cec32cda5..c304d9b1d9c 100644 --- a/admin/tool/httpsreplace/index.php +++ b/admin/tool/httpsreplace/index.php @@ -29,9 +29,6 @@ admin_externalpage_setup('toolhttpsreplace'); $context = context_system::instance(); -require_login(); -require_capability('moodle/site:config', $context); - $PAGE->set_context($context); $PAGE->set_url(new moodle_url('/admin/tool/httpsreplace/index.php')); $PAGE->set_title(get_string('pageheader', 'tool_httpsreplace')); diff --git a/admin/tool/httpsreplace/tool.php b/admin/tool/httpsreplace/tool.php index 12d5acb2430..6d2d96349d7 100644 --- a/admin/tool/httpsreplace/tool.php +++ b/admin/tool/httpsreplace/tool.php @@ -32,9 +32,6 @@ admin_externalpage_setup('toolhttpsreplace'); $context = context_system::instance(); -require_login(); -require_capability('moodle/site:config', $context); - $PAGE->set_context($context); $PAGE->set_url(new moodle_url('/admin/tool/httpsreplace/index.php')); $PAGE->set_title(get_string('pageheader', 'tool_httpsreplace')); diff --git a/admin/tool/innodb/index.php b/admin/tool/innodb/index.php index 6e99834f273..d17c47665bf 100644 --- a/admin/tool/innodb/index.php +++ b/admin/tool/innodb/index.php @@ -32,8 +32,6 @@ admin_externalpage_setup('toolinnodb'); $confirm = optional_param('confirm', 0, PARAM_BOOL); -require_login(); -require_capability('moodle/site:config', context_system::instance()); echo $OUTPUT->header(); echo $OUTPUT->heading('Convert all MySQL tables from MYISAM to InnoDB'); diff --git a/admin/tool/log/store/database/test_settings.php b/admin/tool/log/store/database/test_settings.php index 21a470ee00c..5b5d8fbcb2f 100644 --- a/admin/tool/log/store/database/test_settings.php +++ b/admin/tool/log/store/database/test_settings.php @@ -25,9 +25,6 @@ require_once('../../../../../config.php'); require_once($CFG->dirroot . '/lib/adminlib.php'); -require_login(); -$context = context_system::instance(); -require_capability('moodle/site:config', $context); require_sesskey(); navigation_node::override_active_url(new moodle_url('/admin/settings.php', array('section' => 'logsettingdatabase'))); diff --git a/admin/tool/monitor/managerules.php b/admin/tool/monitor/managerules.php index e914cef738a..13f21a93d48 100644 --- a/admin/tool/monitor/managerules.php +++ b/admin/tool/monitor/managerules.php @@ -33,7 +33,6 @@ $status = optional_param('status', 0, PARAM_BOOL); // Validate course id. if (empty($courseid)) { - require_login(); $context = context_system::instance(); $coursename = format_string($SITE->fullname, true, array('context' => $context)); $PAGE->set_context($context); diff --git a/admin/tool/spamcleaner/index.php b/admin/tool/spamcleaner/index.php index 2f98bf41006..ce017f6300b 100644 --- a/admin/tool/spamcleaner/index.php +++ b/admin/tool/spamcleaner/index.php @@ -41,7 +41,6 @@ $ignore = optional_param('ignore', '', PARAM_RAW); $reset = optional_param('reset', '', PARAM_RAW); $id = optional_param('id', '', PARAM_INT); -require_login(); admin_externalpage_setup('toolspamcleaner'); // Delete one user diff --git a/admin/tool/unsuproles/index.php b/admin/tool/unsuproles/index.php index 93e3bbd7792..e2522ba600e 100644 --- a/admin/tool/unsuproles/index.php +++ b/admin/tool/unsuproles/index.php @@ -29,9 +29,7 @@ require_once($CFG->libdir.'/adminlib.php'); $action = optional_param('action', '', PARAM_ALPHANUMEXT); -$syscontext = context_system::instance(); -require_login(); admin_externalpage_setup('toolunsuproles'); // checks permissions specified in settings.php if ($action === 'delete') { diff --git a/admin/tool/uploaduser/index.php b/admin/tool/uploaduser/index.php index 496b52dd1ac..9a60af3149b 100644 --- a/admin/tool/uploaduser/index.php +++ b/admin/tool/uploaduser/index.php @@ -39,7 +39,6 @@ $previewrows = optional_param('previewrows', 10, PARAM_INT); core_php_time_limit::raise(60*60); // 1 hour should be enough raise_memory_limit(MEMORY_HUGE); -require_login(); admin_externalpage_setup('tooluploaduser'); require_capability('moodle/site:uploadusers', context_system::instance()); diff --git a/admin/tool/uploaduser/picture.php b/admin/tool/uploaduser/picture.php index 03091aa7ea4..a1d0d3de82f 100644 --- a/admin/tool/uploaduser/picture.php +++ b/admin/tool/uploaduser/picture.php @@ -36,8 +36,6 @@ define ('PIX_FILE_SKIPPED', 2); admin_externalpage_setup('tooluploaduserpictures'); -require_login(); - require_capability('tool/uploaduser:uploaduserpictures', context_system::instance()); $site = get_site(); diff --git a/admin/tool/xmldb/index.php b/admin/tool/xmldb/index.php index 8feef19d104..4dd92102e4b 100644 --- a/admin/tool/xmldb/index.php +++ b/admin/tool/xmldb/index.php @@ -50,8 +50,6 @@ if (!isset($SESSION->xmldb)) { // Some previous checks $site = get_site(); -require_login(); -require_capability('moodle/site:config', context_system::instance()); // Body of the script, based on action, we delegate the work $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT); diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php index 9bfc65bf8cd..91dd0c41ae9 100644 --- a/admin/user/user_bulk_confirm.php +++ b/admin/user/user_bulk_confirm.php @@ -8,7 +8,6 @@ require_once($CFG->libdir.'/adminlib.php'); $confirm = optional_param('confirm', 0, PARAM_BOOL); -require_login(); admin_externalpage_setup('userbulk'); require_capability('moodle/user:update', context_system::instance()); diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php index 474903a7055..1b8b8ea52bb 100644 --- a/admin/user/user_bulk_delete.php +++ b/admin/user/user_bulk_delete.php @@ -8,7 +8,6 @@ require_once($CFG->libdir.'/adminlib.php'); $confirm = optional_param('confirm', 0, PARAM_BOOL); -require_login(); admin_externalpage_setup('userbulk'); require_capability('moodle/user:delete', context_system::instance()); diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php index 08f5b32c180..babede0d9bd 100644 --- a/admin/user/user_bulk_download.php +++ b/admin/user/user_bulk_download.php @@ -30,7 +30,6 @@ require_once($CFG->dirroot.'/user/profile/lib.php'); $dataformat = optional_param('dataformat', '', PARAM_ALPHA); -require_login(); admin_externalpage_setup('userbulk'); require_capability('moodle/user:update', context_system::instance()); diff --git a/admin/user/user_bulk_forcepasswordchange.php b/admin/user/user_bulk_forcepasswordchange.php index 203f69c47ee..a8e522a723d 100644 --- a/admin/user/user_bulk_forcepasswordchange.php +++ b/admin/user/user_bulk_forcepasswordchange.php @@ -9,7 +9,6 @@ require_once($CFG->libdir.'/adminlib.php'); $confirm = optional_param('confirm', 0, PARAM_BOOL); -require_login(); admin_externalpage_setup('userbulk'); require_capability('moodle/user:update', context_system::instance()); diff --git a/admin/user/user_bulk_message.php b/admin/user/user_bulk_message.php index 008367b6b26..adf90ffb356 100644 --- a/admin/user/user_bulk_message.php +++ b/admin/user/user_bulk_message.php @@ -7,7 +7,6 @@ require_once('user_message_form.php'); $msg = optional_param('msg', '', PARAM_CLEANHTML); $confirm = optional_param('confirm', 0, PARAM_BOOL); -require_login(); admin_externalpage_setup('userbulk'); require_capability('moodle/site:manageallmessaging', context_system::instance()); diff --git a/admin/webservice/tokens.php b/admin/webservice/tokens.php index f15f7c20578..b4d246a2029 100644 --- a/admin/webservice/tokens.php +++ b/admin/webservice/tokens.php @@ -42,7 +42,6 @@ if ($node && $newnode) { $newnode->make_active(); } -require_capability('moodle/site:config', context_system::instance()); $tokenlisturl = new moodle_url("/" . $CFG->admin . "/settings.php", array('section' => 'webservicetokens')); diff --git a/auth/test_settings.php b/auth/test_settings.php index c0eef4b5686..8d7a0fa33bf 100644 --- a/auth/test_settings.php +++ b/auth/test_settings.php @@ -32,9 +32,6 @@ if (!core_component::is_valid_plugin_name('auth', $auth)) { $auth = ''; } -require_login(); -require_capability('moodle/site:config', context_system::instance()); - navigation_node::override_active_url(new moodle_url('/admin/settings.php', array('section'=>'manageauths'))); admin_externalpage_setup('authtestsettings'); diff --git a/comment/index.php b/comment/index.php index 470d3a5417f..390b9deb045 100644 --- a/comment/index.php +++ b/comment/index.php @@ -26,7 +26,6 @@ require_once('../config.php'); require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->dirroot.'/comment/locallib.php'); -require_login(); admin_externalpage_setup('comments', '', null, '', array('pagelayout'=>'report')); $context = context_system::instance(); diff --git a/course/pending.php b/course/pending.php index cfea7380414..710ca555eb5 100644 --- a/course/pending.php +++ b/course/pending.php @@ -35,9 +35,6 @@ require_once($CFG->libdir . '/adminlib.php'); require_once($CFG->dirroot . '/course/lib.php'); require_once($CFG->dirroot . '/course/request_form.php'); -require_login(); -require_capability('moodle/site:approvecourse', context_system::instance()); - $approve = optional_param('approve', 0, PARAM_INT); $reject = optional_param('reject', 0, PARAM_INT); diff --git a/enrol/test_settings.php b/enrol/test_settings.php index 30efd91b59a..3053c82aa3d 100644 --- a/enrol/test_settings.php +++ b/enrol/test_settings.php @@ -32,9 +32,6 @@ if (!core_component::is_valid_plugin_name('enrol', $enrol)) { $enrol = ''; } -require_login(); -require_capability('moodle/site:config', context_system::instance()); - navigation_node::override_active_url(new moodle_url('/admin/settings.php', array('section'=>'manageenrols'))); admin_externalpage_setup('enroltestsettings'); diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php index dedd4bf2462..9f4e0758b7f 100644 --- a/grade/edit/letter/index.php +++ b/grade/edit/letter/index.php @@ -48,7 +48,6 @@ $returnurl = null; $editparam = null; if ($context->contextlevel == CONTEXT_SYSTEM or $context->contextlevel == CONTEXT_COURSECAT) { require_once $CFG->libdir.'/adminlib.php'; - require_login(); admin_externalpage_setup('letters'); diff --git a/message/defaultoutputs.php b/message/defaultoutputs.php index 398fe25fcef..994d6ebc66b 100644 --- a/message/defaultoutputs.php +++ b/message/defaultoutputs.php @@ -28,9 +28,6 @@ require_once($CFG->libdir.'/adminlib.php'); // This is an admin page admin_externalpage_setup('defaultmessageoutputs'); -// Require site configuration capability -require_capability('moodle/site:config', context_system::instance()); - // Fetch processors $processors = get_message_processors(true); // Fetch message providers diff --git a/my/indexsys.php b/my/indexsys.php index ad16f4441a1..a7bcdc27e03 100644 --- a/my/indexsys.php +++ b/my/indexsys.php @@ -41,8 +41,6 @@ require_once($CFG->libdir.'/adminlib.php'); $resetall = optional_param('resetall', null, PARAM_BOOL); -require_login(); - $header = "$SITE->shortname: ".get_string('myhome')." (".get_string('mypage', 'admin').")"; $PAGE->set_blocks_editing_capability('moodle/my:configsyspages'); diff --git a/report/loglive/index.php b/report/loglive/index.php index e3e174027a3..ec091fa2baa 100644 --- a/report/loglive/index.php +++ b/report/loglive/index.php @@ -33,7 +33,7 @@ $page = optional_param('page', 0, PARAM_INT); $logreader = optional_param('logreader', '', PARAM_COMPONENT); // Reader which will be used for displaying logs. if (empty($id)) { - require_login(); + admin_externalpage_setup('reportloglive', '', null, '', array('pagelayout' => 'report')); $context = context_system::instance(); $coursename = format_string($SITE->fullname, true, array('context' => $context)); } else { @@ -75,9 +75,7 @@ if ($page == 0 && !empty($logreader)) { $strlivelogs = get_string('livelogs', 'report_loglive'); $strupdatesevery = get_string('updatesevery', 'moodle', $refresh); -if (empty($id)) { - admin_externalpage_setup('reportloglive', '', null, '', array('pagelayout' => 'report')); -} + $PAGE->set_url($url); $PAGE->set_context($context); $PAGE->set_title("$coursename: $strlivelogs ($strupdatesevery)"); diff --git a/report/performance/index.php b/report/performance/index.php index 09551115d24..d3f12fd6a77 100644 --- a/report/performance/index.php +++ b/report/performance/index.php @@ -28,7 +28,6 @@ require('../../config.php'); require_once($CFG->dirroot.'/report/performance/locallib.php'); require_once($CFG->libdir.'/adminlib.php'); -require_login(); // Show detailed info about one issue only. $issue = optional_param('issue', '', PARAM_ALPHANUMEXT); diff --git a/report/security/index.php b/report/security/index.php index 7385211c84a..29fb038dba8 100644 --- a/report/security/index.php +++ b/report/security/index.php @@ -29,7 +29,6 @@ require('../../config.php'); require_once($CFG->dirroot.'/report/security/locallib.php'); require_once($CFG->libdir.'/adminlib.php'); -require_login(); $issue = optional_param('issue', '', PARAM_ALPHANUMEXT); // show detailed info about one issue only diff --git a/user/profilesys.php b/user/profilesys.php index a6a00724dab..8ff17d1f3ab 100644 --- a/user/profilesys.php +++ b/user/profilesys.php @@ -33,7 +33,6 @@ require_once($CFG->libdir.'/adminlib.php'); $resetall = optional_param('resetall', null, PARAM_BOOL); -require_login(); $header = "$SITE->shortname: ".get_string('publicprofile')." (".get_string('myprofile', 'admin').")";