L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

community block/registration/publication MDL-24230 change /admin/ for $CFG->admin and /lib/ for $CFG->libdir

Browse Source
This commit is contained in:
jerome mouneyrac
2010-09-24 05:12:44 +00:00
parent 3ced70fa5e
commit a8e174ccd8
15 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/registration/confirmregistration.php
+1 -1
View File
@@ -72,7 +72,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
if (!extension_loaded('xmlrpc')) {
//display notice about xmlrpc
$xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
$xmlrpcnotification = $OUTPUT->doc_link($CFG->admin . '/environment/php_extension/xmlrpc', '');
$xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
echo $OUTPUT->notification($xmlrpcnotification);
}
admin/registration/forms.php
+2 -2
View File
@@ -31,8 +31,8 @@
*/
require_once($CFG->dirroot . '/lib/formslib.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->libdir . '/formslib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
/**
* This form display a unregistration form.
admin/registration/hubselector.php
+2 -2
View File
@@ -28,7 +28,7 @@
require('../../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot.'/admin/registration/forms.php');
require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/forms.php');
admin_externalpage_setup('registrationselector');
@@ -55,7 +55,7 @@ if (!empty($huburl) and confirm_sesskey()) {
$hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
$params = array('sesskey' => sesskey(), 'huburl' => $huburl,
'password' => $password, 'hubname' => $hubname);
redirect(new moodle_url($CFG->wwwroot."/admin/registration/register.php",
redirect(new moodle_url($CFG->wwwroot."/" . $CFG->admin . "/registration/register.php",
$params));
}
admin/registration/index.php
+3 -3
View File
@@ -29,8 +29,8 @@
require('../../config.php');
require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->dirroot . '/admin/registration/forms.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
require_once($CFG->dirroot . '/course/publish/lib.php');
require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
@@ -155,7 +155,7 @@ if (empty($cancel) and $unregistration and !$confirm) {
echo $renderer->registeredonhublisting($hubs);
}
} else { //display notice about xmlrpc
$xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
$xmlrpcnotification = $OUTPUT->doc_link($CFG->admin . '/environment/php_extension/xmlrpc', '');
$xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
echo $OUTPUT->notification($xmlrpcnotification);
}
admin/registration/register.php
+2 -2
View File
@@ -35,9 +35,9 @@
require_once('../../config.php');
require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->dirroot . '/admin/registration/forms.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
require_once($CFG->dirroot . '/webservice/lib.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
admin_externalpage_setup('registrationindex');
admin/registration/renderer.php
+5 -3
View File
@@ -46,6 +46,7 @@ class core_register_renderer extends plugin_renderer_base {
* Display the page to register on Moodle.org or on a specific hub
*/
public function registrationselector() {
global $CFG;
$table = new html_table();
$table->head = array(get_string('moodleorg', 'hub'), get_string('specifichub', 'hub'));
$table->size = array('50%', '50%');
@@ -66,7 +67,7 @@ class core_register_renderer extends plugin_renderer_base {
$table->data[] = $row;
//Moodle.org button cell
$registeronmoodleorgurl = new moodle_url("/admin/registration/register.php",
$registeronmoodleorgurl = new moodle_url("/" . $CFG->admin . "/registration/register.php",
array('sesskey' => sesskey(), 'huburl' => HUB_MOODLEORGHUBURL
, 'hubname' => 'Moodle.org'));
$registeronmoodleorgbutton = new single_button($registeronmoodleorgurl,
@@ -76,7 +77,7 @@ class core_register_renderer extends plugin_renderer_base {
$moodleorgcell = $registeronmoodleorgbuttonhtml;
//Specific hub button cell
$registeronspecifichuburl = new moodle_url("/admin/registration/hubselector.php",
$registeronspecifichuburl = new moodle_url("/" . $CFG->admin . "/registration/hubselector.php",
array('sesskey' => sesskey()));
$registeronspecifichubbutton = new single_button($registeronspecifichuburl,
get_string('registeronspecifichub', 'hub'));
@@ -96,6 +97,7 @@ class core_register_renderer extends plugin_renderer_base {
* Display the listing of registered on hub
*/
public function registeredonhublisting($hubs) {
global $CFG;
$table = new html_table();
$table->head = array(get_string('hub', 'hub'), get_string('operation', 'hub'));
$table->size = array('80%', '20%');
@@ -104,7 +106,7 @@ class core_register_renderer extends plugin_renderer_base {
$hublink = html_writer::tag('a', $hub->hubname, array('href' => $hub->huburl));
$hublinkcell = html_writer::tag('div', $hublink, array('class' => 'registeredhubrow'));
$unregisterhuburl = new moodle_url("/admin/registration/index.php",
$unregisterhuburl = new moodle_url("/" . $CFG->admin . "/registration/index.php",
array('sesskey' => sesskey(), 'huburl' => $hub->huburl,
'unregistration' => 1));
$unregisterbutton = new single_button($unregisterhuburl,
blocks/community/communitycourse.php
+2 -2
View File
@@ -30,7 +30,7 @@
require('../../config.php');
require_once($CFG->dirroot . '/blocks/community/locallib.php');
require_once($CFG->dirroot . '/blocks/community/forms.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_login();
@@ -53,7 +53,7 @@ $usercandownload = has_capability('moodle/community:download', $context);
if (empty($usercansearch)) {
$notificationerror = get_string('cannotsearchcommunity', 'hub');
} else if (!extension_loaded('xmlrpc')) {
$notificationerror = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
$notificationerror = $OUTPUT->doc_link($CFG->admin . '/environment/php_extension/xmlrpc', '');
$notificationerror .= get_string('xmlrpcdisabledcommunity', 'hub');
}
if (!empty($notificationerror)) {
blocks/community/forms.php
+3 -3
View File
@@ -30,9 +30,9 @@
* Form for community search
*/
require_once($CFG->dirroot . '/lib/formslib.php');
require_once($CFG->libdir . '/formslib.php');
require_once($CFG->dirroot . '/course/publish/lib.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
class community_hub_search_form extends moodleform {
@@ -242,7 +242,7 @@ class community_hub_search_form extends moodleform {
$this->init_javascript_enhancement('subject', 'smartselect',
array('selectablecategories' => true, 'mode' => 'compact'));
require_once($CFG->dirroot . "/lib/licenselib.php");
require_once($CFG->libdir . "/licenselib.php");
$licensemanager = new license_manager();
$licences = $licensemanager->get_licenses();
$options = array();
blocks/community/locallib.php
+1 -1
View File
@@ -80,7 +80,7 @@ class block_community_manager {
*/
public function block_community_download_course_backup($course) {
global $CFG, $USER;
require_once($CFG->dirroot. "/lib/filelib.php");
require_once($CFG->libdir . "/filelib.php");
require_once($CFG->dirroot. "/course/publish/lib.php");
$params['courseid'] = $course->id;
blocks/community/renderer.php
+1 -1
View File
@@ -159,7 +159,7 @@ class block_community_renderer extends plugin_renderer_base {
$course->lang = '';
}
//licence
require_once($CFG->dirroot . "/lib/licenselib.php");
require_once($CFG->libdir . "/licenselib.php");
$licensemanager = new license_manager();
$licenses = $licensemanager->get_licenses();
foreach ($licenses as $license) {
course/publish/backup.php
+3 -3
View File
@@ -33,9 +33,9 @@
require_once('../../config.php');
require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
require_once($CFG->dirroot . '/backup/moodle2/backup_plan_builder.class.php');
require_once($CFG->dirroot.'/admin/registration/lib.php');
require_once($CFG->dirroot.'/course/publish/lib.php');
require_once($CFG->dirroot.'/lib/filelib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot . '/course/publish/lib.php');
require_once($CFG->libdir . '/filelib.php');
//retrieve initial page parameters
course/publish/forms.php
+3 -3
View File
@@ -31,8 +31,8 @@
*/
require_once($CFG->dirroot . '/lib/formslib.php');
require_once($CFG->dirroot . "/admin/registration/lib.php");
require_once($CFG->libdir . '/formslib.php');
require_once($CFG->dirroot . "/" . $CFG->admin . "/registration/lib.php");
require_once($CFG->dirroot . "/course/publish/lib.php");
/*
@@ -261,7 +261,7 @@ class course_publication_form extends moodleform {
require_once($CFG->dirroot . "/lib/licenselib.php");
require_once($CFG->libdir . "/licenselib.php");
$licensemanager = new license_manager();
$licences = $licensemanager->get_licenses();
$options = array();
course/publish/hubselector.php
+1 -1
View File
@@ -26,7 +26,7 @@
require('../../config.php');
require_once($CFG->dirroot.'/admin/registration/lib.php');
require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot.'/course/publish/forms.php');
$id = optional_param('id', 0, PARAM_INT);
course/publish/index.php
+3 -3
View File
@@ -27,8 +27,8 @@
*/
require('../../config.php');
require_once($CFG->dirroot.'/admin/registration/lib.php');
require_once($CFG->dirroot.'/course/publish/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot . '/course/publish/lib.php');
$id = optional_param('id', 0, PARAM_INT);
$hubname = optional_param('hubname', 0, PARAM_TEXT);
@@ -45,7 +45,7 @@ $PAGE->set_heading($course->fullname);
//check that the PHP xmlrpc extension is enabled
if (!extension_loaded('xmlrpc')) {
$notificationerror = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
$notificationerror = $OUTPUT->doc_link($CFG->admin . '/environment/php_extension/xmlrpc', '');
$notificationerror .= get_string('xmlrpcdisabledpublish', 'hub');
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('publishcourse', 'hub', $course->shortname), 3, 'main');
course/publish/metadata.php
+3 -4
View File
@@ -32,9 +32,9 @@
require_once('../../config.php');
require_once($CFG->dirroot . '/course/publish/forms.php');
require_once($CFG->dirroot . '/admin/registration/lib.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot . '/course/publish/lib.php');
require_once($CFG->dirroot . '/lib/filelib.php');
require_once($CFG->libdir . '/filelib.php');
//check user access capability to this page
@@ -55,7 +55,7 @@ $PAGE->set_heading($course->fullname);
//check that the PHP xmlrpc extension is enabled
if (!extension_loaded('xmlrpc')) {
$errornotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
$errornotification = $OUTPUT->doc_link($CFG->admin . '/environment/php_extension/xmlrpc', '');
$errornotification .= get_string('xmlrpcdisabledpublish', 'hub');
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('publishcourse', 'hub', $course->shortname), 3, 'main');
@@ -213,7 +213,6 @@ if (has_capability('moodle/course:publish', get_context_instance(CONTEXT_COURSE,
// send screenshots
if (!empty($fromform->screenshots)) {
require_once($CFG->dirroot . "/lib/filelib.php");
if (!empty($fromform->deletescreenshots)) {
$screenshotnumber = 0;